From d89d198f96157d63d49c19223e15d48c7fb64646 Mon Sep 17 00:00:00 2001
From: jamesread <contact@jread.com>
Date: Fri, 24 Mar 2023 16:01:41 +0000
Subject: [PATCH] feature: ghcr

---
 .goreleaser.yml  | 16 ++++++++++++++++
 Dockerfile       |  2 ++
 Dockerfile.arm64 |  2 ++
 Dockerfile.armv7 |  2 ++
 4 files changed, 22 insertions(+)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 9a39b4d..b4a42a2 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -89,6 +89,7 @@ archives:
 dockers:
   - image_templates:
       - "docker.io/jamesread/olivetin:{{ .Tag }}-amd64"
+      - "ghcr.io/olivetin/olivetin:{{ .Tag }}-amd64"
     dockerfile: Dockerfile
     goos: linux
     goarch: amd64
@@ -104,6 +105,7 @@ dockers:
 
   - image_templates:
       - "docker.io/jamesread/olivetin:{{ .Tag }}-arm64"
+      - "ghcr.io/olivetin/olivetin:{{ .Tag }}-amd64"
     dockerfile: Dockerfile.arm64
     goos: linux
     goarch: arm64
@@ -127,6 +129,16 @@ docker_manifests:
       - docker.io/jamesread/olivetin:{{ .Version }}-amd64
       - docker.io/jamesread/olivetin:{{ .Version }}-arm64
 
+  - name_template: ghcr.io/olivetin/olivetin:{{ .Version }}
+    image_templates:
+      - ghcr.io/olivetin/olivetin:{{ .Version }}-amd64
+      - ghcr.io/olivetin/olivetin:{{ .Version }}-arm64
+
+  - name_template: ghcr.io/olivetin/olivetin:latest
+    image_templates:
+      - ghcr.io/olivetin/olivetin:{{ .Version }}-amd64
+      - ghcr.io/olivetin/olivetin:{{ .Version }}-arm64
+
 nfpms:
   - id: default
     maintainer: James Read <contact@jread.com>
@@ -213,6 +225,10 @@ nfpms:
 
 release:
   footer: |
+    ## Container images (from GitHub)
+
+    - `docker pull ghcr.io/olivetin/olivetin:{{ .Version }}`
+
     ## Container images ([on Docker Hub](https://hub.docker.com/r/jamesread/olivetin/tags?page=1&ordering=last_updated))
 
     - `docker pull docker.io/jamesread/olivetin:{{ .Version }}`
diff --git a/Dockerfile b/Dockerfile
index 5186ea1..d3e72a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64
 
+LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+
 RUN mkdir -p /config /var/www/olivetin \
     && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
 		iputils \
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index e80041a..b171685 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,5 +1,7 @@
 FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64
 
+LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+
 RUN mkdir -p /config /var/www/olivetin \
     && \
     microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
index cc7cd9f..802a151 100644
--- a/Dockerfile.armv7
+++ b/Dockerfile.armv7
@@ -1,5 +1,7 @@
 FROM --platform=linux/armhfp registry.fedoraproject.org/fedora-minimal:36-armhfp
 
+LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+
 RUN mkdir -p /config /var/www/olivetin \
     && \
     microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \