Merge pull request #7 from martin-g/update-ubuntu-for-cross-build

pcarruscag · web-flow · commit f6a0b39561b3 · 2022-06-30T14:08:26.000-07:00
The Docker image for cross build should depend on the latest su2/build-su2 image
diff --git a/.github/workflows/docker-image-upload.yml b/.github/workflows/docker-image-upload.yml
@@ -42,3 +42,6 @@ jobs:
 
       - name: Build and push test-su2
         run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2:${{ steps.vars.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/test-su2:${{ steps.vars.outputs.date_tag }} --push ./test/
+
+      - name: Build and push build-su2-cross
+        run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2:${{ steps.vars.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/build-su2-cross:${{ steps.vars.outputs.date_tag }} --push ./build_cross/
diff --git a/build_cross/Dockerfile b/build_cross/Dockerfile
@@ -1,4 +1,6 @@
-FROM su2code/build-su2:latest
+ARG BASE_IMAGE=ghcr.io/su2code/su2/build-su2:220614-1237
+FROM $BASE_IMAGE
+
 ENV LANG C.UTF-8
 RUN apt-get update && apt-get install -y \
     clang \
diff --git a/test/Dockerfile b/test/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=su2code/build-su2:latest
+ARG ghcr.io/su2code/su2/build-su2:220614-1237
 
 FROM $BASE_IMAGE
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BASE_IMAGE=su2code/build-su2:latest`
	`1`	`+ARG ghcr.io/su2code/su2/build-su2:220614-1237`
`2`	`2`
`3`	`3`	`FROM $BASE_IMAGE`
`4`	`4`