Merge branch 'master' of ssh://repo.prod.meissa.de:2222/meissa/c4k-nextcloud

infrastructure/backup/image/Dockerfile

@@ -1,5 +1,5 @@
-FROM domaindrivenarchitecture/dda-backup:1.0.9
+FROM domaindrivenarchitecture/dda-backup:latest
 
 # Prepare Entrypoint Script
 ADD resources /tmp
-RUN /tmp/install.sh
+RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh

infrastructure/backup/image/resources/backup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -Eexo pipefail
 
 function main() {
 

infrastructure/backup/image/resources/end-maintenance.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -exo pipefail
 
 if test -f "/var/backups/config/config.orig"; then
 

infrastructure/backup/image/resources/entrypoint-start-and-wait.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -exo pipefail
+
 function main() {
     file_env POSTGRES_DB
     file_env POSTGRES_PASSWORD

infrastructure/backup/image/resources/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -Eexo pipefail
 
 function main() {
     file_env POSTGRES_DB

infrastructure/backup/image/resources/init.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -Eexo pipefail
 
 function main() {
     file_env AWS_ACCESS_KEY_ID

infrastructure/backup/image/resources/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -exo pipefail
 
 install -m 0700 /tmp/entrypoint.sh /
 install -m 0700 /tmp/entrypoint-start-and-wait.sh /

infrastructure/backup/image/resources/list-snapshots.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -exo pipefail
 
 function list-snapshot-files() {
   if [ -z ${CERTIFICATE_FILE} ];

infrastructure/backup/image/resources/restore.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux pipefail
+set -Eexo pipefail
 
 function main() {
     local role_snapshot_id="${1:-latest}"

infrastructure/backup/image/resources/start-maintenance.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -eux pipefail
-
 if [ ! -f "/var/backups/config/config.orig" ]; then
 
     rm -f /var/backups/config/config.orig

infrastructure/backup/test/Dockerfile

@@ -1,10 +0,0 @@
-FROM c4k-cloud-backup
-
-RUN apt update > /dev/null
-RUN apt -yqq --no-install-recommends --yes install curl default-jre-headless > /dev/null
-
-RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar
-
-COPY serverspec.edn /tmp/serverspec.edn
-
-RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v

infrastructure/nextcloud/image/Dockerfile

@@ -1,8 +1,8 @@
-FROM nextcloud:25
+FROM nextcloud:27
 
 # Prepare Entrypoint Script
 ADD resources /tmp
-RUN /tmp/install.sh
+RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]

infrastructure/nextcloud/image/resources/install.sh

@@ -1,11 +1,20 @@
 #!/bin/bash
-set -eux pipefail
+set -exo pipefail
 
-apt update && apt -qqy install postgresql-client > /dev/null
+function main() {
+    {
+        upgradeSystem
+        apt-get install -qqy ca-certificates curl gnupg postgresql-client
+        mkdir /var/data
+    } > /dev/null
 
-mkdir /var/data
+    install -m 0700 /tmp/install-debug.sh /usr/local/bin/
+    install -m 0544 /tmp/upload-max-limit.ini /usr/local/etc/php/conf.d/
+    install -m 0544 /tmp/memory-limit.ini /usr/local/etc/php/conf.d/
+    install -m 0755 /tmp/entrypoint.sh /
     
-install -m 0700 /tmp/install-debug.sh /usr/local/bin/
+    cleanupDocker
-install -m 0544 /tmp/upload-max-limit.ini /usr/local/etc/php/conf.d/
+}
-install -m 0544 /tmp/memory-limit.ini /usr/local/etc/php/conf.d/
+
-install -m 0755 /tmp/entrypoint.sh /
+source /tmp/install_functions.sh
+main

infrastructure/nextcloud/test/Dockerfile

@@ -1,10 +0,0 @@
-FROM c4k-cloud
-
-RUN apt-get update
-RUN apt-get -yqq install --no-install-recommends --yes curl default-jre-headless
-
-RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar
-
-COPY serverspec.edn /tmp/serverspec.edn
-
-RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v