Bookworm stabilized

VitexSoftware · Jul 11, 2023 · 79a7031 · 79a7031
1 parent 4c7ebd8
commit 79a7031
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Test/Jenkinsfile b/Test/Jenkinsfile
@@ -1,6 +1,8 @@
 #!groovy
 
-String[] architectures = []
+// Part of https://github.com/VitexSoftware/BuildImages
+
+String[] architectures = [] // 'amd64', 'aarch64', 'arm', 'i386'
 String[] distributions = ['debian:buster', 'debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy']
 
 String vendor = 'vitexsoftware'

diff --git a/debian:bookworm/Dockerfile b/debian:bookworm/Dockerfile
@@ -19,10 +19,5 @@ RUN \
 
 RUN sed -i -e '/sendmail_path/c\sendmail_path="cat - >> /tmp/mailfile"' /etc/php/*/*/php.ini ; touch /tmp/mailfile ; chmod uog+rw /tmp/mailfile
 
-#Dirty Hacks:
-RUN sed -i -e 's/11/12/g' /usr/lib/os-release ; sed -i -e 's/bullseye/bookworm/g' /usr/lib/os-release ; 
-RUN apt-get update && apt-get install -y php8.1-xml 
-#TODO: Remove when stabilized
-
 RUN mkdir -p /var/lib/jenkins/workspace/ ; chown jenkins:jenkins /var/lib/jenkins/ -Rv