Merge pull request #1048 from VWS-Python/buildx

Add Docker buildx stage

Author: adamtheturtle

.github/workflows/docker-build.yml

@@ -3,6 +3,8 @@
 name: Build Docker images
 
 # This matches the Docker image building done in the release process.
+#
+# It is possible to use https://github.com/nektos/act to run this workflow.
 
 on:
   push:
@@ -22,31 +24,42 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          # This defaults to "docker-containerized".
+          # We want to share the vws-mock:base image to the building of the
+          # later builds, without pushing to a registry.
+          #
+          # Therefore, we choose not to build in a container.
+          driver: docker
+
       - name: Build base Docker image
         uses: docker/[email protected]
         with:
+          buildkitd-flags: --debug
           file: src/mock_vws/_flask_server/dockerfiles/base/Dockerfile
           push: false
           tags: |
             vws-mock:base
 
-      - name: Build and push target manager Docker image
+      - name: Build target manager Docker image
         uses: docker/[email protected]
         with:
           file: src/mock_vws/_flask_server/dockerfiles/target_manager/Dockerfile
           push: false
           tags: |
             adamtheturtle/vuforia-target-manager-mock:latest
 
-      - name: Build and push VWS Docker image
+      - name: Build VWS Docker image
         uses: docker/[email protected]
         with:
           file: src/mock_vws/_flask_server/dockerfiles/vws/Dockerfile
           push: false
           tags: |
             adamtheturtle/vuforia-vws-mock:latest
 
-      - name: Build and push VWQ Docker image
+      - name: Build VWQ Docker image
         uses: docker/[email protected]
         with:
           file: src/mock_vws/_flask_server/dockerfiles/vwq/Dockerfile

.github/workflows/release.yml

@@ -81,6 +81,16 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          # This defaults to "docker-containerized".
+          # We want to share the vws-mock:base image to the building of the
+          # later builds, without pushing to a registry.
+          #
+          # Therefore, we choose not to build in a container.
+          driver: docker
+
       - name: Build base Docker image
         uses: docker/[email protected]
         with:

docs/source/docker.rst

@@ -143,7 +143,7 @@ Building images from source
    export VWS_TAG=adamtheturtle/vuforia-vws-mock:latest
    export VWQ_TAG=adamtheturtle/vuforia-vwq-mock:latest
 
-   docker build $REPOSITORY_ROOT --file $BASE_DOCKERFILE --tag $BASE_TAG
-   docker build $REPOSITORY_ROOT --file $TARGET_MANAGER_DOCKERFILE --tag $TARGET_MANAGER_TAG
-   docker build $REPOSITORY_ROOT --file $VWS_DOCKERFILE --tag $VWS_TAG
-   docker build $REPOSITORY_ROOT --file $VWQ_DOCKERFILE --tag $VWQ_TAG
+   docker buildx build $REPOSITORY_ROOT --file $BASE_DOCKERFILE --tag $BASE_TAG
+   docker buildx build $REPOSITORY_ROOT --file $TARGET_MANAGER_DOCKERFILE --tag $TARGET_MANAGER_TAG
+   docker buildx build $REPOSITORY_ROOT --file $VWS_DOCKERFILE --tag $VWS_TAG
+   docker buildx build $REPOSITORY_ROOT --file $VWQ_DOCKERFILE --tag $VWQ_TAG