DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup docker build (#5083)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-15 09:27:41 -03:00 committed by GitHub
parent eedcdcdbf6
commit eed9e0d57f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/images/ingress-controller/build-ingress-controller.sh
View file

@ -80,19 +80,18 @@ git clone https://github.com/kubernetes/ingress-nginx
cd ingress-nginx cd ingress-nginx
# disable docker in docker tasks
export DIND_TASKS=0
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
make init-docker-buildx make init-docker-buildx
docker buildx use ingress-nginx --default --global docker buildx use ingress-nginx --default --global
echo "Building NGINX image..." # disable docker in docker tasks
make all-container export DIND_TASKS=0
echo "Publishing NGINX images..." echo "Building NGINX image..."
make all-push ARCH=amd64 make build container push
ARCH=arm make build container push
ARCH=arm64 make build container push
# Requires https://github.com/kubernetes/ingress-nginx/pull/4271 # Requires https://github.com/kubernetes/ingress-nginx/pull/4271
#echo "Creating multi-arch images..." #echo "Creating multi-arch images..."

BIN
images/nginx/38cb695de87cfeadcba5eeaf57f39e41d529aa1f.tar.gz
View file

Binary file not shown.

7
images/nginx/Makefile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.97 TAG ?= 0.98
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
IMGNAME = nginx IMGNAME = nginx
@ -44,11 +44,6 @@ container:
--platform $(PLATFORM) \ --platform $(PLATFORM) \
--tag $(IMAGE)-$(PLATFORM):$(TAG) rootfs;) --tag $(IMAGE)-$(PLATFORM):$(TAG) rootfs;)
ifeq ($(ARCH), amd64)
# This is for to maintain the backward compatibility
docker tag $(MULTI_ARCH_IMG):$(TAG) $(IMAGE):$(TAG)
endif
.PHONY: push .PHONY: push
push: container push: container
$(foreach PLATFORM,$(PLATFORMS), \ $(foreach PLATFORM,$(PLATFORMS), \