docker ci / deploy fixes

crossbario · Feb 13, 2021 · f7dec93 · f7dec93
1 parent f185f6a
commit f7dec93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,11 +15,11 @@ jobs:
 
   image_amd64:
 
-    # dockeer images only built and published (to DockerHub) when merging to master (not a yet unmerged PR!)
+    # docker images are only built and published (to DockerHub) when merging to master (not a yet unmerged PR!)
     if: github.ref == 'refs/heads/master'
 
-    # runs-on: ubuntu-20.04
-    runs-on: [self-hosted, linux, X64] # means matterhorn
+    # means x86-64 (xeon-d) host: matterhorn
+    runs-on: [self-hosted, linux, X64]
 
     env:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
@@ -76,11 +76,11 @@ jobs:
 
   image_arm64:
 
-    # dockeer images only built and published (to DockerHub) when merging to master (not a yet unmerged PR!)
+    # docker images are only built and published (to DockerHub) when merging to master (not a yet unmerged PR!)
     if: github.ref == 'refs/heads/master'
 
-    # runs-on: ubuntu-20.04
-    runs-on: [self-hosted, linux, ARM64] # means matterhorn
+    # means ARM64v8 (AWS Graviton) host: buildbox-arm64.crossbario.com
+    runs-on: [self-hosted, linux, ARM64]
 
     env:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}

diff --git a/docker/Dockerfile.cpy-slim b/docker/Dockerfile.cpy-slim
@@ -19,14 +19,10 @@ ENV AUTOBAHN_BUILD_DATE $AUTOBAHN_BUILD_DATE
 ENV AUTOBAHN_VCS_REF $AUTOBAHN_VCS_REF
 ENV AUTOBAHN_VERSION $AUTOBAHN_VERSION
 
-# !!! DO NOT REMOVE !!!
-#
 # copy qemu-x86 statically linked (!) qemu host tools into the container image,
 # so that the non-x86 image can be run on x86 hosts without qemu installed on the host
-COPY .qemu/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-COPY .qemu/qemu-arm-static /usr/bin/qemu-arm-static
-#
-# !!! DO NOT REMOVE !!!
+# COPY .qemu/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+# COPY .qemu/qemu-arm-static /usr/bin/qemu-arm-static
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/docker/Dockerfile.pypy-slim b/docker/Dockerfile.pypy-slim
@@ -19,14 +19,10 @@ ENV AUTOBAHN_BUILD_DATE $AUTOBAHN_BUILD_DATE
 ENV AUTOBAHN_VCS_REF $AUTOBAHN_VCS_REF
 ENV AUTOBAHN_VERSION $AUTOBAHN_VERSION
 
-# !!! DO NOT REMOVE !!!
-#
 # copy qemu-x86 statically linked (!) qemu host tools into the container image,
 # so that the non-x86 image can be run on x86 hosts without qemu installed on the host
-COPY .qemu/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-COPY .qemu/qemu-arm-static /usr/bin/qemu-arm-static
-#
-# !!! DO NOT REMOVE !!!
+# COPY .qemu/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+# COPY .qemu/qemu-arm-static /usr/bin/qemu-arm-static
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive