From 76620c2609f90a0bda2aaf0af9cc47c5bdafad5c Mon Sep 17 00:00:00 2001
From: chris <cg@zknt.org>
Date: Thu, 30 Dec 2021 16:09:52 +0100
Subject: [PATCH 1/3] synfix

---
 build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.yaml b/build.yaml
index 5bc45bf..845c9cb 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,3 +1,4 @@
+---
 version: ""
 project: pixelfed
 trigger_upstream: ../debian-php-74/trunk

From 9d6db46dd7b0f9aac875e49d20a46c907ca3fde0 Mon Sep 17 00:00:00 2001
From: chris <cg@zknt.org>
Date: Thu, 30 Dec 2021 17:55:41 +0100
Subject: [PATCH 2/3] bug workaround

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index d6bfd1f..30227f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN set -xe;\
   git clone https://github.com/pixelfed/pixelfed.git www &&\
   cd www &&\
   curl -L https://github.com/hnrd/pixelfed/commit/${PATCH_COMMIT}.patch | git apply &&\
+  composer require beyondcode/laravel-self-diagnosis &&\
   composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
   ln -s public html &&\
   chown -R www-data:www-data /var/www &&\

From 1ef8cbefeaabe97cc902ce23f571ccb094bebb83 Mon Sep 17 00:00:00 2001
From: chris <cg@zknt.org>
Date: Tue, 8 Feb 2022 20:37:53 +0100
Subject: [PATCH 3/3] add Impressum page

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

diff --git a/Dockerfile b/Dockerfile
index 30227f9..68ec638 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@ FROM reg.zknt.org/zknt/debian-php:7.4 as builder
 ARG DATE
 
 ENV PHPVER=7.4
-ENV PATCH_COMMIT=ece5d198c11a599b5151031de1fd1ecc330a7141
+ENV IP_PATCH=2722da0c4749b726bfb87ac56ba055940c2d2fc7
+ENV IMPRESSUM_PATCH=dbb47aa7ef59f83e9f88d71992b928b618b4bc03
 
 RUN set -xe;\
   apt-install git unzip php${PHPVER}-curl php${PHPVER}-zip php${PHPVER}-bcmath php${PHPVER}-intl php${PHPVER}-mbstring php${PHPVER}-xml composer &&\
@@ -11,7 +12,8 @@ RUN set -xe;\
   cd /var && rm -rf www &&\
   git clone https://github.com/pixelfed/pixelfed.git www &&\
   cd www &&\
-  curl -L https://github.com/hnrd/pixelfed/commit/${PATCH_COMMIT}.patch | git apply &&\
+  curl -L https://github.com/hnrd/pixelfed/commit/${IP_PATCH}.patch | git apply &&\
+  curl -L https://github.com/hnrd/pixelfed/commit/${IMPRESSUM_PATCH}.patch | git apply &&\
   composer require beyondcode/laravel-self-diagnosis &&\
   composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
   ln -s public html &&\