From 32d2fbbe081b09e671b199af8a45cee62a2a7f38 Mon Sep 17 00:00:00 2001
From: Piotr Klubinski <piotr.klubinski@jamf.com>
Date: Mon, 28 Nov 2022 21:06:31 +0100
Subject: [PATCH] fixed release workflow, added docker release

---
 .github/workflows/release.yml | 49 +++++++++++++++++++++++++++++++++--
 Dockerfile                    |  2 ++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0498170..05b5ddf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,11 @@ on:
     tags:
     - "*.*.*"
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  TAG: ${{ github.ref_name }}
+
 jobs:
   release-binary:
     runs-on: ubuntu-latest
@@ -22,5 +27,45 @@ jobs:
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          scepserver-.*.zip
-          scepclient-.*.zip
\ No newline at end of file
+          scepserver-*.zip
+          scepclient-*.zip
+
+  release-docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Install Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19.x
+    - name: Build
+      shell: bash
+      run: make docker
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Docker build & push
+      uses: docker/build-push-action@v3
+      with:
+        push: true
+        context: .
+        tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
index 12ef04e..c3a91ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,9 @@ FROM alpine:latest
 RUN adduser scep --uid 1010 --disabled-password --gecos ""
 
 COPY ./scepserver-linux-amd64 /usr/bin/scepserver
+COPY ./scepclient-linux-amd64 /usr/bin/scepclient
 RUN chown scep:scep /usr/bin/scepserver
+RUN chown scep:scep /usr/bin/scepclient
 
 EXPOSE 8080