Use official Swift images for amd64 and arm64 (#59)

* Use Official Images (Focal) for amd64 and arm64 * Update docker.yml * Dockerfile takes over swift version
Kaiede · Aug 30, 2022 · 1730503 · 1730503
1 parent fa27fc8
commit 1730503
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,9 +25,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Set up Variables
-      run: . Docker/configure.sh ${{ matrix.arch }}
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@master
       if: matrix.arch != 'amd64'

diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -1,7 +1,4 @@
-
-ARG swift_base=swift
-ARG swift_version=5.6.2
-ARG swift_image=$swift_base:$swift_version
+ARG swift_image=swift:5.6.2-focal
 
 ###### BUILDER
 FROM $swift_image as builder

diff --git a/build-docker.sh b/build-docker.sh
@@ -18,12 +18,12 @@ if [ "$arch" == "aarch64" ]; then
     arch=arm64
 fi
 
-. Docker/configure.sh $arch
+#. Docker/configure.sh $arch
 
 dockerTag=$dockerRepo:${tag}-${arch}
 
 docker build . -f Docker/Dockerfile \
     -t $dockerTag \
     --build-arg arch=${arch} \
-    --build-arg swift_base=${swift_base} \
-    --build-arg swift_version=${swift_version}
+#    --build-arg swift_base=${swift_base} \
+#    --build-arg swift_version=${swift_version}