Merge pull request kubernetes#1689 from aledbf/switch-nginx

Enable s390x

.travis.yml

@@ -63,3 +63,7 @@ jobs:
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
     script:
     - ARCH=ppc64le .travis/publish.sh
+  - stage: publish s390x
+    if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
+    script:
+    - ARCH=s390x .travis/publish.sh

.travis/nginx-slim.sh → .travis/nginx.sh

@@ -18,13 +18,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $DIR/common.sh
 
-IMAGE=$(make -s -C $DIR/../images/nginx-slim image-info)
+IMAGE=$(make -s -C $DIR/../images/nginx image-info)
 
-if docker_tag_exists "kubernetes-ingress-controller/nginx-slim" $(echo $IMAGE | jq .tag) "$ARCH"; then
+if docker_tag_exists "kubernetes-ingress-controller/nginx" $(echo $IMAGE | jq .tag) "$ARCH"; then
     echo "Image already published"
     exit 0
 fi
 
-echo "building nginx-slim-$ARCH image..."
-make -C $DIR/../images/nginx-slim sub-container-$ARCH
-make -C $DIR/../images/nginx-slim sub-push-$ARCH
+echo "building nginx-$ARCH image..."
+make -C $DIR/../images/nginx sub-container-$ARCH
+make -C $DIR/../images/nginx sub-push-$ARCH

.travis/publish.sh

@@ -25,11 +25,8 @@ case "$COMPONENT" in
 "ingress-controller")
     $DIR/ingress-controller.sh
     ;;
-"ubuntu-slim")
-    $DIR/ubuntu-slim.sh
-    ;;
-"nginx-slim")
-    $DIR/nginx-slim.sh
+"nginx")
+    $DIR/nginx.sh
     ;;
 *)
     echo "Invalid option in environment variable COMPONENT"

.travis/release-from-travis.sh

@@ -57,7 +57,7 @@ EOF
 }
 
 case "$1" in
-	ingress-controller|ubuntu-slim|nginx-slim)
+	ingress-controller|nginx)
 		publish $TRAVIS_CI_TOKEN $1
 	;;
 	*)

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: push
+all: all-container
 
 BUILDTAGS=
 
@@ -40,7 +40,7 @@ ARCH ?= $(shell go env GOARCH)
 GOARCH = ${ARCH}
 DUMB_ARCH = ${ARCH}
 
-ALL_ARCH = amd64 arm arm64 ppc64le
+ALL_ARCH = amd64 arm arm64 ppc64le s390x
 
 QEMUVERSION=v2.9.1
 
@@ -49,21 +49,24 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-slim-$(ARCH):0.28
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.29
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm
 	GOARCH=arm
 	DUMB_ARCH=armhf
 endif
 ifeq ($(ARCH),arm64)
-        QEMUARCH=aarch64
+    QEMUARCH=aarch64
 endif
 ifeq ($(ARCH),ppc64le)
 	QEMUARCH=ppc64le
 	GOARCH=ppc64le
 	DUMB_ARCH=ppc64el
 endif
+ifeq ($(ARCH),s390x)
+    QEMUARCH=s390x
+endif
 
 TEMP_DIR := $(shell mktemp -d)
 
@@ -72,8 +75,6 @@ DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile
 image-info:
 	echo -n '{"image":"$(IMAGE)","tag":"$(TAG)"}'
 
-all: all-container
-
 sub-container-%:
 	$(MAKE) ARCH=$* build container
 

rootfs/Dockerfile

@@ -17,19 +17,9 @@ FROM BASEIMAGE
 CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 # install dumb-init from zesty
-RUN if grep -q -i "ports.ubuntu.com" /etc/apt/sources.list; \
-  then \
-    echo "deb http://ports.ubuntu.com/ubuntu-ports zesty universe" >> /etc/apt/sources.list; \
-  else \
-    echo "deb http://archive.ubuntu.com/ubuntu zesty universe" >> /etc/apt/sources.list; \
-  fi \
-  && DEBIAN_FRONTEND=noninteractive apt-get update \
-  && apt-get install -y \
-    diffutils \
-    dumb-init \
-    --no-install-recommends \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+RUN clean-install \
+  diffutils \
+  dumb-init
 
 ENTRYPOINT ["/usr/bin/dumb-init"]