From 2dc2a4cc3ca6670e669115cbe2814431b8b6925c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 15 Feb 2024 13:48:55 +0100
Subject: [PATCH] Automatically push container image to Github Container Repo

---
 .github/workflows/container.yml | 46 +++++++++++++++++++++++++++++++++
 .github/workflows/publish.yml   | 31 ----------------------
 Dockerfile                      | 21 ++++++++-------
 3 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 .github/workflows/container.yml
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
new file mode 100644
index 0000000..f24c30f
--- /dev/null
+++ b/.github/workflows/container.yml
@@ -0,0 +1,46 @@
+name: "Container image build"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+
+  image:
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value={{date 'YYYY-MM-DDTHH-mm'}}
+            type=raw,value=latest
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.ref == 'refs/heads/master' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 12b98a1..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-on:
-  push
-
-permissions:
-    contents: write
-    packages: write
-
-jobs:
-  container-image:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - run: |
-        go mod init gtfstidy
-        go mod tidy
-        go build .
-    - run: |
-        echo "VERSION=$(date +%Y-%m-%dT%H-%M)" >> $GITHUB_ENV
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Build and push
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: lehrenfried/gtfstidy:latest,lehrenfried/gtfstidy:${{ env.VERSION }}
diff --git a/Dockerfile b/Dockerfile
index 4092671..7a7dfe3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,16 @@
-FROM debian:stable-slim
+FROM docker.io/golang:bookworm AS builder
 
-LABEL org.opencontainers.image.title="gtfstidy"
-LABEL org.opencontainers.image.description="A tool for checking, sanitizing and minimizing GTFS feeds."
-LABEL org.opencontainers.image.authors="Patrick Brosi <info@patrickbrosi.de>"
-LABEL org.opencontainers.image.documentation="https://github.com/patrickbr/gtfstidy"
-LABEL org.opencontainers.image.source="https://github.com/patrickbr/gtfstidy"
-LABEL org.opencontainers.image.revision="v0.2"
-LABEL org.opencontainers.image.licenses="GPL-2.0"
+WORKDIR src
 
-COPY gtfstidy /usr/local/bin/gtfstidy
+COPY *.go ./
+COPY processors/ ./processors/
+
+RUN go mod init gtfstidy
+RUN go mod tidy
+RUN go build .
+
+FROM docker.io/debian:stable-slim
+
+COPY --from=builder /go/src/gtfstidy /usr/local/bin/gtfstidy
 
 ENTRYPOINT ["/usr/local/bin/gtfstidy"]