From d1c25b6a822b2fea639bf10636ccc5eaca8f34d8 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Wed, 29 Jan 2025 20:51:51 +0100
Subject: [PATCH 1/4] =?UTF-8?q?update=20skib=5Fbuild=20down=C3=B6oad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skib_application_dockerfile | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/skib_application_dockerfile b/skib_application_dockerfile
index 182b3fa..9c9a1fa 100644
--- a/skib_application_dockerfile
+++ b/skib_application_dockerfile
@@ -53,24 +53,14 @@ RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/02-symfony.sh \
     && echo "php bin/console cache:clear" >> /docker-entrypoint-init.d/02-symfony.sh \
     && chmod +x /docker-entrypoint-init.d/02-symfony.sh
 
-RUN --mount=type=secret,id=ARTIFACT_USER \
-    --mount=type=secret,id=ARTIFACT_SECRET \
-    --mount=type=secret,id=ARTIFACT_URL \
-    ARTIFACT_USER=$(cat /run/secrets/ARTIFACT_USER) \
-    ARTIFACT_SECRET=$(cat /run/secrets/ARTIFACT_SECRET) \
-    ARTIFACT_URL=$(cat /run/secrets/ARTIFACT_URL) \
-    && wget https://${ARTIFACT_USER}:${ARTIFACT_SECRET}@${ARTIFACT_URL}-${VERSION}.zip -O artifact.zip \
-    && unzip artifact.zip \
-    && chown -R nobody public \
-    && chown -R nobody var \
-    && chmod -R 700 public \
-    && chmod -R 700 var
-
-RUN rm artifact.zip \
-    && rm -r var/cache
-
 USER nobody
 
+RUN wget https://github.com/H2-invent/open-datenschutzcenter/releases/download/${VERSION}/artifact.zip -O artifact.zip \
+    && unzip artifact.zip \
+    && mkdir data \
+    && mkdir -p var/log \
+    && mkdir -p var/cache
+
 ENV nginx_root_directory=/var/www/html/public \
     memory_limit=1024M \
     post_max_size=20M \
-- 
2.39.5


From 90d5b35d0f11b13c7672cf00bcce84f521389147 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Wed, 29 Jan 2025 20:56:18 +0100
Subject: [PATCH 2/4] fix download

---
 skib_application_dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skib_application_dockerfile b/skib_application_dockerfile
index 9c9a1fa..e3d431d 100644
--- a/skib_application_dockerfile
+++ b/skib_application_dockerfile
@@ -55,7 +55,7 @@ RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/02-symfony.sh \
 
 USER nobody
 
-RUN wget https://github.com/H2-invent/open-datenschutzcenter/releases/download/${VERSION}/artifact.zip -O artifact.zip \
+RUN wget https://github.com/H2-invent/skib-unsere-schulkindbetreuung/releases/download/${VERSION}/artifact.zip -O artifact.zip \
     && unzip artifact.zip \
     && mkdir data \
     && mkdir -p var/log \
@@ -65,4 +65,4 @@ ENV nginx_root_directory=/var/www/html/public \
     memory_limit=1024M \
     post_max_size=20M \
     upload_max_filesize=10M \
-    date_timezone=Europe/Berlin
\ No newline at end of file
+    date_timezone=Europe/Berlin
-- 
2.39.5


From 6234fa836431cf389098fa8f1d204169d30288d4 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Wed, 29 Jan 2025 21:36:17 +0100
Subject: [PATCH 3/4] update

---
 skib_application_dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/skib_application_dockerfile b/skib_application_dockerfile
index e3d431d..5f6f789 100644
--- a/skib_application_dockerfile
+++ b/skib_application_dockerfile
@@ -59,7 +59,8 @@ RUN wget https://github.com/H2-invent/skib-unsere-schulkindbetreuung/releases/do
     && unzip artifact.zip \
     && mkdir data \
     && mkdir -p var/log \
-    && mkdir -p var/cache
+    && mkdir -p var/cache \
+    && rm artifact.zip
 
 ENV nginx_root_directory=/var/www/html/public \
     memory_limit=1024M \
-- 
2.39.5


From c1e51cce406252f4c059ab40f05fdf7f9d41ac6b Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Wed, 29 Jan 2025 21:45:23 +0100
Subject: [PATCH 4/4] use h2 base image

---
 skib_application_dockerfile | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/skib_application_dockerfile b/skib_application_dockerfile
index 5f6f789..1944ab3 100644
--- a/skib_application_dockerfile
+++ b/skib_application_dockerfile
@@ -1,8 +1,5 @@
-ARG PHP_IMAGE_VERSION=3.20.6
-FROM erseco/alpine-php-webserver:${PHP_IMAGE_VERSION}
-
-ARG VERSION
-ARG SUPERCRONIC_VERSION=0.2.33
+FROM git.h2-invent.com/public-system-design/alpine-php8-cron-webserver:3.20.7
+ARG VERSION=development
 
 LABEL version="${VERSION}" \
     Maintainer="H2 invent GmbH" \
@@ -30,18 +27,6 @@ RUN apk --no-cache add \
 
 RUN echo "Europe/Berlin" > /etc/timezone
 
-RUN wget https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-amd64 -O /supercronic \
-    && chmod +x /supercronic
-
-RUN wget https://git.h2-invent.com/Public-System-Design/Public-Helperscripts/raw/branch/main/distributed_cron.sh -O /distributed_cron.sh \
-    && chmod +x /distributed_cron.sh
-
-RUN mkdir /etc/service/cron \
-    && echo "#!/bin/sh" > /etc/service/cron/run \
-    && echo "exec 2>&1 /supercronic /var/crontab" >> /etc/service/cron/run \
-    && chown -R nobody:nobody /etc/service/cron \
-    && chmod -R +x /etc/service/cron
-
 RUN echo "# Docker Cron Jobs" > /var/crontab \
     && echo "*/10 * * * * php /var/www/html/bin/console app:statistik:generate" >> /var/crontab \
     && echo "" >> /var/crontab \
-- 
2.39.5