From 4c3994fd35d5b5f7a02645b720e0cf70d6ac7638 Mon Sep 17 00:00:00 2001 From: Tony Cavella <9434191+acavella@users.noreply.github.com> Date: Thu, 11 Jan 2024 20:10:14 +0000 Subject: [PATCH 1/3] docs: add LABELS to runner add title, url, description, licenses fixes #14 --- build/docker/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index f443c3c..02d4937 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -12,8 +12,12 @@ RUN apk add --no-cache -U git \ FROM registry.access.redhat.com/ubi9/ubi:9.3-1476 as runner ARG BUILD_TAG -LABEL maintainer="Tony Cavella " -LABEL app.version=${BUILD_TAG} +LABEL org.opencontainers.image.title="GoRevoke" +LABEL org.opencontainers.image.version=${BUILD_TAG} +LABEL org.opencontainers.image.author="Tony Cavella " +LABEL org.opencontainers.image.url="https://github.com/acavella/gorevoke" +LABEL org.opencontainers.image.description="GoRevoke is a standalone Certificate Revocation List Distrution Point written in Go, designed to be lightweight and fully self-contained." +LABEL org.opencontainers.image.licenses="MIT" COPY --from=builder /usr/local/bin/gorevoke/ /usr/local/bin/gorevoke/ From ea066ea7e012d51aaad7d468f234e6cbd359202b Mon Sep 17 00:00:00 2001 From: Tony Cavella <9434191+acavella@users.noreply.github.com> Date: Fri, 12 Jan 2024 02:09:09 +0000 Subject: [PATCH 2/3] bump version --- README.md | 2 +- build/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3de46e..cdecd0e 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ docker run -d \ -v ${PWD}/appdata/gorevoke/crl:/usr/local/bin/gorevoke/crl/static \ -v ${PWD}/appdata/gorevoke/config:/usr/local/bin/gorevoke/conf \ --restart=unless-stopped \ -s0lution/gorevoke:latest +ghcr.io/acavella/gorevoke:latest ``` > [!IMPORTANT] diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 02d4937..b2163bb 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_TAG=v1.0.0-rc13 +ARG BUILD_TAG=v1.0.0 FROM docker.io/library/golang:1.20.12-alpine3.19 as builder ARG BUILD_TAG From a92942c8ccd883c4d8c92e3f94376412162f6c4e Mon Sep 17 00:00:00 2001 From: Tony Cavella <9434191+acavella@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:40:19 +0000 Subject: [PATCH 3/3] ci: update workflow add docker hub build --- .github/workflows/dockerbuild.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 2e2c357..bce9279 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -5,8 +5,8 @@ on: types: [created] jobs: - docker-build: - name: Docker Build + ghcr-build: + name: GHCR Build runs-on: ubuntu-latest steps: @@ -20,3 +20,19 @@ jobs: addLatest: true username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + + docker-build: + name: Docker Hub Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + name: Check out code + - uses: mr-smithers-excellent/docker-build-push@v6 + with: + image: s0lution/gorevoke + registry: docker.io + dockerfile: build/docker/Dockerfile + addLatest: true + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file