Change 4 jobs build to automatic jobs build on linux-armv7a

Change 4 jobs build to automatic jobs build on linux-armv7a

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: |
             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/base --all-tags
+            docker image push dockcross/base
 
   image:
     name: ${{ matrix.arch_name }}
@@ -58,4 +58,4 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: |
             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/${{ matrix.arch_name }} --all-tags
+            docker image push dockcross/${{ matrix.arch_name }}

Makefile

@@ -79,12 +79,18 @@ web-wasm: web-wasm/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasm/
 	$(DOCKER) build -t $(ORG)/web-wasm:latest \
-		-t $(ORG)/web-wasm:$(TAG) \
 		--build-arg IMAGE=$(ORG)/web-wasm \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		web-wasm
+	$(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \
+		--build-arg IMAGE=$(ORG)/web-wasm \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		web-wasm
 	rm -rf web-wasm/test
 	rm -rf $@/imagefiles
 
@@ -100,12 +106,18 @@ web-wasm.test: web-wasm
 manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \
-		-t $(ORG)/manylinux2014-aarch64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-aarch64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-aarch64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-aarch64.test: manylinux2014-aarch64
@@ -118,12 +130,18 @@ manylinux2014-aarch64.test: manylinux2014-aarch64
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \
-		-t $(ORG)/manylinux2014-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-x64.test: manylinux2014-x64
@@ -136,12 +154,18 @@ manylinux2014-x64.test: manylinux2014-x64
 manylinux2014-x86: manylinux2014-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \
-		-t $(ORG)/manylinux2014-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-x86.test: manylinux2014-x86
@@ -155,12 +179,18 @@ manylinux2014-x86.test: manylinux2014-x86
 manylinux2010-x64: manylinux2010-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \
-		-t $(ORG)/manylinux2010-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2010-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2010-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2010-x64.test: manylinux2010-x64
@@ -174,12 +204,18 @@ manylinux2010-x64.test: manylinux2010-x64
 manylinux2010-x86: manylinux2010-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
-		-t $(ORG)/manylinux2010-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2010-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2010-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2010-x86.test: manylinux2010-x86
@@ -193,12 +229,18 @@ manylinux2010-x86.test: manylinux2010-x86
 manylinux1-x64: manylinux1-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
-		-t $(ORG)/manylinux1-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux1-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux1-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux1-x64.test: manylinux1-x64
@@ -212,12 +254,18 @@ manylinux1-x64.test: manylinux1-x64
 manylinux1-x86: manylinux1-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
-		-t $(ORG)/manylinux1-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux1-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux1-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux1-x86.test: manylinux1-x86
@@ -230,10 +278,14 @@ manylinux1-x86.test: manylinux1-x86
 
 base: Dockerfile imagefiles/
 	$(DOCKER) build -t $(ORG)/base:latest \
-		-t $(ORG)/base:$(TAG) \
 		--build-arg IMAGE=$(ORG)/base \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		.
+	$(DOCKER) build -t $(ORG)/base:$(TAG) \
+		--build-arg IMAGE=$(ORG)/base \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		.
 
 base.test: base
 	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
@@ -253,12 +305,18 @@ $(VERBOSE).SILENT: display_images
 $(STANDARD_IMAGES): %: %/Dockerfile base
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/$@:latest \
-		-t $(ORG)/$@:$(TAG) \
 		--build-arg IMAGE=$(ORG)/$@ \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		$@
+	$(DOCKER) build -t $(ORG)/$@:$(TAG) \
+		--build-arg IMAGE=$(ORG)/$@ \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		$@
 	rm -rf $@/imagefiles
 
 clean:
@@ -266,12 +324,6 @@ clean:
 	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done
 	rm -f Dockerfile
 
-purge: clean
-# Remove all untagged images
-	$(DOCKER) container ls -aq | xargs --no-run-if-empty $(DOCKER) container rm -f
-# Remove all images with organization (ex dockcross/*)
-	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
-
 #
 # testing implicit rule
 #

common.crosstool

@@ -21,10 +21,6 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
     help2man \
     python3-dev \
     texinfo \
-# Packages needed for crosstool-ng 1.24 or higher 
-    unzip \
-    libtool \
-    libtool-bin \
     && apt-get clean autoclean --yes \
     && apt-get autoremove --yes \
     && rm -rf /var/lib/{apt,dpkg,cache,log}/

linux-mips/Dockerfile.in

@@ -3,8 +3,7 @@ FROM dockcross/base:latest
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled
 
 # Crosstool-ng version
-# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION crosstool-ng-1.23.0
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 
 #include "common.crosstool"
 

web-wasm/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.24
+FROM emscripten/emsdk:2.0.22
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell