From 57c9ddd73e44acd8dffd0b3f09bc44c3da5dfefe Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Fri, 21 Jun 2024 16:21:10 +0200
Subject: [PATCH] Fixup
---
.github/workflows/docker.build.yml | 2 ++
.github/workflows/docker.clean.yml | 2 +-
.github/workflows/docker.release.yml | 3 +--
.github/workflows/docker.validate.yml | 2 +-
Dockerfile | 27 ++++++++++++++-------------
docker-compose.override.yml | 2 +-
docker-compose.yml | 4 ++++
7 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index ad38c8d..07bd80e 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -29,6 +29,8 @@ jobs:
context: .
target: loadbalancer
build-args: |
+ MAINTAINER=${{ vars.PUBLIC_MAINTAINER || 'Matthew Baggett <matthew@baggett.me>' }}
+ SOURCE_URL="https://github.com/${{ github.repository }}"
GIT_SHA=${{ github.sha }}
GIT_BUILD_ID=${{ github.ref_name }}
GIT_COMMIT_MESSAGE=${{ github.event.head_commit.message }}
diff --git a/.github/workflows/docker.clean.yml b/.github/workflows/docker.clean.yml
index b432a4e..18cf19d 100644
--- a/.github/workflows/docker.clean.yml
+++ b/.github/workflows/docker.clean.yml
@@ -23,7 +23,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
organization: ${{ github.repository_owner }}
- container: ${{ github.repository_name }}
+ container: docker-swarm-loadbalancer
dry-run: true
prune-tags-regexes: |
^build-${{ github.sha }}$
diff --git a/.github/workflows/docker.release.yml b/.github/workflows/docker.release.yml
index ec06fc6..dbec1e0 100644
--- a/.github/workflows/docker.release.yml
+++ b/.github/workflows/docker.release.yml
@@ -10,7 +10,7 @@ on:
env:
CANDIDATE_IMAGE: ghcr.io/${{ github.repository }}:sha-${{ github.sha }}
- RELEASE_IMAGE: ghcr.io/${{ github.repository }}:latest
+ RELEASE_IMAGE: ghcr.io/${{ github.repository }}:latest
jobs:
release-ghcr:
@@ -21,4 +21,3 @@ jobs:
- run: docker pull ${{ env.CANDIDATE_IMAGE }}
- run: docker tag ${{ env.CANDIDATE_IMAGE }} ${{ env.RELEASE_IMAGE }}
- run: docker push ${{ env.RELEASE_IMAGE }}
-
diff --git a/.github/workflows/docker.validate.yml b/.github/workflows/docker.validate.yml
index d1d49d5..9855777 100644
--- a/.github/workflows/docker.validate.yml
+++ b/.github/workflows/docker.validate.yml
@@ -13,7 +13,7 @@ on:
- completed
env:
- CANDIDATE_IMAGE: ghcr.io/${{ github.repository_owner }}/${{ github.repository_name }}:hash-${{ github.sha }}
+ CANDIDATE_IMAGE: ghcr.io/${{ github.repository }}:hash-${{ github.sha }}
jobs:
validate-install-report:
diff --git a/Dockerfile b/Dockerfile
index 6d405aa..a2d7e2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,22 @@
# checkov:skip=CKV_DOCKER_3 I don't have time for rootless
FROM ghcr.io/benzine-framework/php:cli-8.2 AS loadbalancer
-LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
- org.label-schema.vcs-url="https://github.com/benzine-framework/docker-swarm-loadbalancer" \
- org.opencontainers.image.source="https://github.com/benzine-framework/docker-swarm-loadbalancer"
# Allow overriding the default SSL cert subject
ARG DEFAULT_SSL_CERT_SUBJECT="/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=CommonNameOrHostname"
+ARG PUBLIC_MAINTAINER="Matthew Baggett <matthew@baggett.me>"
+ARG SOURCE_URL="https://github.com/benzine-framework/docker-swarm-loadbalancer"
+ARG BUILD_DATE
+ARG GIT_SHA
+ARG GIT_BUILD_ID
+ARG GIT_COMMIT_MESSAGE
+ENV BUILD_DATE=${BUILD_DATE} \
+ GIT_SHA=${GIT_SHA} \
+ GIT_BUILD_ID=${GIT_BUILD_ID} \
+ GIT_COMMIT_MESSAGE=${GIT_COMMIT_MESSAGE}
+
+LABEL maintainer="${PUBLIC_MAINTAINER}" \
+ org.label-schema.vcs-url="${SOURCE_URL}" \
+ org.opencontainers.image.source="${SOURCE_URL}"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -83,16 +94,6 @@ COPY src /app/src
COPY templates /app/templates
RUN chmod +x /app/bin/bouncer
-# stuff some envs from build
-ARG BUILD_DATE
-ARG GIT_SHA
-ARG GIT_BUILD_ID
-ARG GIT_COMMIT_MESSAGE
-ENV BUILD_DATE=${BUILD_DATE} \
- GIT_SHA=${GIT_SHA} \
- GIT_BUILD_ID=${GIT_BUILD_ID} \
- GIT_COMMIT_MESSAGE=${GIT_COMMIT_MESSAGE}
-
# Create some volumes for logs and certs
VOLUME /etc/letsencrypt
VOLUME /var/log/bouncer
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 30c611f..4a53ea2 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,5 @@
services:
- bouncer:
+ loadbalancer:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./src:/app/src
diff --git a/docker-compose.yml b/docker-compose.yml
index 010e8d7..5062687 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,12 @@ services:
target: loadbalancer
additional_contexts:
- php:cli=docker-image://ghcr.io/benzine-framework/php:cli-8.2
+ args:
+ PUBLIC_MAINTAINER: "Matthew Baggett <test@baggett.me>"
+ SOURCE_URL: "https://git.grey.ooo/Benzine/docker-swarm-loadbalancer"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
+ image: loadbalancer-test
networks:
default:
aliases: