Enable s390x

This commit is contained in:
Manuel de Brito Fontes 2017-11-12 00:40:10 -03:00
parent 27108da170
commit 1cee16f96a
7 changed files with 22 additions and 60 deletions

View file

@ -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

View file

@ -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"

View file

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

View file

@ -1,30 +0,0 @@
#!/usr/bin/env bash
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $DIR/common.sh
IMAGE=$(make -s -C $DIR/../images/ubuntu-slim image-info)
if docker_tag_exists "kubernetes-ingress-controller/ubuntu-slim" $(echo $IMAGE | jq .tag) "$ARCH"; then
echo "Image already published"
exit 0
fi
echo "building ubuntu-slim-$ARCH image..."
make -C $DIR/../images/ubuntu-slim sub-container-$ARCH
make -C $DIR/../images/ubuntu-slim sub-push-$ARCH