From 486a4425cb98e376f7dbbe6221ca3747d530ced3 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Mon, 3 Jun 2024 15:42:27 +0100
Subject: [PATCH] Push to GHCR separately, label container

---
 .gitea/workflows/docker-publish.yaml | 18 ++++++++++--------
 Dockerfile                           |  5 +++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/docker-publish.yaml b/.gitea/workflows/docker-publish.yaml
index 16fcbb8..bf87d88 100644
--- a/.gitea/workflows/docker-publish.yaml
+++ b/.gitea/workflows/docker-publish.yaml
@@ -10,20 +10,22 @@ jobs:
         uses: actions/checkout@v4
       - name: Build Docker image
         run: |
-          docker build -t git.i-am.nexus/nex/college-bot:latest -t ghcr.io/nexy7574/college-bot:latest .          
-      - name: Log into GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: nexy7574
-          password: ${{ secrets.GHCR_PASSWORD }}
+          docker build -t git.i-am.nexus/nex/college-bot:latest -t ghcr.io/nexy7574/college-bot:latest .
       - name: Log into forgejo CR
         uses: docker/login-action@v3
         with:
           registry: git.i-am.nexus
           username: nex
           password: ${{ secrets.CR_PASSWORD }}
-      - name: Push to container registry
+      - name: Push to forgejo CR
         run: |
           docker push git.i-am.nexus/nex/college-bot:latest
+      - name: Log into GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: nexy7574
+          password: ${{ secrets.GHCR_PASSWORD }}
+      - name: Push to GHCR
+        run: |
           docker push ghcr.io/nexy7574/college-bot:latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c10b285..e3904e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
 FROM python:3.11-bookworm
 
+LABEL org.opencontainers.image.source https://git.i-am.nexus/nex/college-bot-v2
+LABEL org.opencontainers.image.licenses AGPL-3.0
+LABEL org.opencontainers.image.title "College Bot v2"
+LABEL org.opencontainers.image.description "Version 2 of jimmy."
+
 WORKDIR /app
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update