Merge pull request #3549 from oasisprotocol/dependabot/github_actions…

…/docker/build-push-action-v2.2.1

ci: bump docker/build-push-action from v1 to v2.2.1

.changelog/3549.internal.md

@@ -0,0 +1 @@
+ci: bump docker/build-push-action from v1 to v2.2.1

.changelog/3577.internal.md

@@ -0,0 +1 @@
+dependencies: update bubblewrap to 0.4.1

.github/workflows/docker.yml

@@ -52,25 +52,37 @@ jobs:
             branch=pr-$(git describe --always --match '' --abbrev=7)
           fi
           branch=${branch//\//-}
-          echo "##[set-output name=tag;]$(echo ${branch})"
-      - name: "Rebuild oasisprotocol/oasis-core-dev:${{ steps.determine_tag.outputs.tag }}"
-        uses: docker/build-push-action@v1
+          echo "::set-output name=tag::$(echo ${branch})"
+          echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-          repository: oasisprotocol/oasis-core-dev
-          tags: ${{ steps.determine_tag.outputs.tag }}
-          add_git_labels: true
-          path: docker/development
-          always_pull: true
+      - name: "Rebuild oasisprotocol/oasis-core-dev:${{ steps.determine_tag.outputs.tag }}"
+        uses: docker/[email protected]
+        with:
+          context: docker/development
+          file: docker/development/Dockerfile
+          tags: oasisprotocol/oasis-core-dev:${{ steps.determine_tag.outputs.tag }}
+          pull: true
+          push: true
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.determine_tag.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
       - name: "Rebuild oasisprotocol/oasis-core-ci:${{ steps.determine_tag.outputs.tag }}"
-        uses: docker/build-push-action@v1
+        uses: docker/build-push-action@v2.2.1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-          repository: oasisprotocol/oasis-core-ci
-          tags: ${{ steps.determine_tag.outputs.tag }}
-          add_git_labels: true
-          path: docker/testing
-          build_args: OASIS_CORE_DEV_BASE_TAG=${{ steps.determine_tag.outputs.tag }}
-          always_pull: true
+          context: docker/testing
+          file: docker/testing/Dockerfile
+          tags: oasisprotocol/oasis-core-ci:${{ steps.determine_tag.outputs.tag }}
+          pull: true
+          push: true
+          build-args: OASIS_CORE_DEV_BASE_TAG=${{ steps.determine_tag.outputs.tag }}
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.determine_tag.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}

docker/development/Dockerfile

@@ -72,8 +72,8 @@ RUN wget https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
     GO111MODULE=on go get mvdan.cc/gofumpt@${GOFUMPT_VERSION} && \
     GO111MODULE=on go get mvdan.cc/gofumpt/gofumports@${GOFUMPT_VERSION}
 
-# Install bubblewrap (we need version 0.3.3 which is not available for 18.04).
-RUN wget http://archive.ubuntu.com/ubuntu/pool/main/b/bubblewrap/bubblewrap_0.3.3-2_amd64.deb && \
-    echo '1cf9bdae5cfab75f292fad9ee0ef76a7c55243dbc0515709624b2a9573d19447 bubblewrap_0.3.3-2_amd64.deb' | sha256sum -c && \
-    dpkg -i bubblewrap_0.3.3-2_amd64.deb && \
-    rm bubblewrap_0.3.3-2_amd64.deb
+# Install bubblewrap (we need at least version 0.3.3 which is not available for 18.04).
+RUN wget http://archive.ubuntu.com/ubuntu/pool/main/b/bubblewrap/bubblewrap_0.4.1-1_amd64.deb && \
+    echo '25de452f209e4fdb4b009851c33ca9a0269ebf0b92f4bd9b86186480592cc3e2 bubblewrap_0.4.1-1_amd64.deb' | sha256sum -c && \
+    dpkg -i bubblewrap_0.4.1-1_amd64.deb && \
+    rm bubblewrap_0.4.1-1_amd64.deb