From 3c379e980b42c491d0929c477570796ff43fc79b Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 28 Apr 2021 20:13:39 +0200
Subject: [PATCH 1/3] overrides: rename production config

To make it more clear that it's a docker-compose file, and to not tie it
to a specific host.
---
 overrides/{gbr2-dev1.yml => docker-compose.prod.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename overrides/{gbr2-dev1.yml => docker-compose.prod.yml} (100%)

diff --git a/overrides/gbr2-dev1.yml b/overrides/docker-compose.prod.yml
similarity index 100%
rename from overrides/gbr2-dev1.yml
rename to overrides/docker-compose.prod.yml
-- 
GitLab


From e6408ebb183b6c89fe0d152b74d32c45f0dc9a3f Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 28 Apr 2021 20:28:05 +0200
Subject: [PATCH 2/3] overlay: move crontab to actual location

buildkit has problems copying files to directories which are symlinks.
/var/spool/cron/crontabs is a symlink to /etc/crontabs, so move the
crontab there.

> cannot copy to non-directory: [..]/merged/var/spool/cron/crontabs

See: https://github.com/docker/buildx/issues/150
---
 overlay/{var/spool/cron => etc}/crontabs/python | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename overlay/{var/spool/cron => etc}/crontabs/python (100%)

diff --git a/overlay/var/spool/cron/crontabs/python b/overlay/etc/crontabs/python
similarity index 100%
rename from overlay/var/spool/cron/crontabs/python
rename to overlay/etc/crontabs/python
-- 
GitLab


From c4fcf138c08daca56e454f99ecad085354c33eb1 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 28 Apr 2021 20:34:10 +0200
Subject: [PATCH 3/3] secfix-tracker: upgrade to v0.3.2

---
 docker-compose.yml                | 2 +-
 overrides/docker-compose.prod.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e8b4d36..aa71ace 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     build:
       context: .
       args:
-        - SECFIXES_TRACKER_VERSION=0.3.1
+        - SECFIXES_TRACKER_VERSION=0.3.2
     ports:
       - 8080
   crond:
diff --git a/overrides/docker-compose.prod.yml b/overrides/docker-compose.prod.yml
index 7dd764f..0a85c6b 100644
--- a/overrides/docker-compose.prod.yml
+++ b/overrides/docker-compose.prod.yml
@@ -1,6 +1,8 @@
 version: "3.4"
 services:
   secfixes-tracker:
+    environment:
+      - SECFIXES_TRACKER_VERSION=3.2.1
     restart: unless-stopped
     labels:
       traefik.enable: "true"
-- 
GitLab