From feaa004fbedfe13eea6441c44d3b4ea06c1cec18 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@conroy.org>
Date: Sat, 14 Nov 2020 09:35:11 -0800
Subject: [PATCH 1/4] Upgrade to v2 of the Docker GitHub action

---
 .github/workflows/docker.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ff42c2ca82..25af492864 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,9 +1,10 @@
 name: docker
 
-on:
-  push:
-    branches:
-    - master
+on: [push]
+# on:
+#   push:
+#     branches:
+#     - master
 
 jobs:
 
@@ -11,12 +12,21 @@ jobs:
     name: push kjconroy/sqlc:devel
     runs-on: ubuntu-latest
     steps:
+    - name: Set created date
+      id: prep
+      run: |
+        echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
     - uses: actions/checkout@v2
-    - uses: docker/build-push-action@v2.1.0
+    - uses: docker/setup-buildx-action@v1
+    - uses: docker/login-action@v1
       with:
         username: kjconroy
         password: ${{ secrets.DOCKER_PASSWORD }}
-        build_args: github_ref=${{ github.ref }},github_sha=${{ github.sha }}
-        repository: kjconroy/sqlc
-        add_git_labels: true
-        tags: devel
+    - uses: docker/build-push-action@v2
+      with:
+        build-args: github_ref=${{ github.ref }},github_sha=${{ github.sha }}
+        tags: kjconroy/sqlc:devel
+        labels: |
+          org.opencontainers.image.source=${{ github.event.repository.html_url }}
+          org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+          org.opencontainers.image.revision=${{ github.sha }}

From 3eac119690e7fb949b8d55abb6652bd8d2f18349 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@conroy.org>
Date: Sat, 14 Nov 2020 09:39:58 -0800
Subject: [PATCH 2/4] Add context and file

---
 .github/workflows/docker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 25af492864..2f49ec1c55 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,6 +24,8 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
     - uses: docker/build-push-action@v2
       with:
+        context: .
+        file: ./Dockerfile
         build-args: github_ref=${{ github.ref }},github_sha=${{ github.sha }}
         tags: kjconroy/sqlc:devel
         labels: |

From 3c000a42d690a2e263f2bee749212d2ec68b4873 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@conroy.org>
Date: Sat, 14 Nov 2020 09:45:01 -0800
Subject: [PATCH 3/4] Fix build args

---
 .github/workflows/docker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2f49ec1c55..975f4c3d2a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,9 @@ jobs:
       with:
         context: .
         file: ./Dockerfile
-        build-args: github_ref=${{ github.ref }},github_sha=${{ github.sha }}
+        build-args: |
+          github_ref=${{ github.ref }}
+          github_sha=${{ github.sha }}
         tags: kjconroy/sqlc:devel
         labels: |
           org.opencontainers.image.source=${{ github.event.repository.html_url }}

From 565d1cf7a2bc53f9d7bc344be4ef25c3b9db247b Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@conroy.org>
Date: Sat, 14 Nov 2020 09:47:23 -0800
Subject: [PATCH 4/4] cleanup

---
 .github/workflows/docker.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 975f4c3d2a..759dd97634 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,13 +1,9 @@
 name: docker
-
-on: [push]
-# on:
-#   push:
-#     branches:
-#     - master
-
+on:
+  push:
+    branches:
+    - master
 jobs:
-
   docker:
     name: push kjconroy/sqlc:devel
     runs-on: ubuntu-latest