Improvements docker image building

infrastructure/docker/image/resources/install.sh

@@ -4,12 +4,11 @@ set -exo pipefail
 
 function main() {
     {
-    apt-get update
+        upgradeSystem
-    apt-get upgrade -y
+        apt-get install -qqy ca-certificates curl gnupg postgresql-client-14
-    apt-get install -qqy ca-certificates curl gnupg postgresql-client-14
+        curl -Ss --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg
-    curl -Ss --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg
+        sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-    sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+        upgradeSystem
-    apt-get upgrade -y
     } > /dev/null
 
     update-ca-certificates

infrastructure/docker/test/Dockerfile

@@ -1,9 +0,0 @@
-FROM dda-backup
-
-RUN apt update > /dev/null && apt -yqq install openjdk-13-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/docker/test/serverspec.edn

@@ -1,5 +0,0 @@
-{:package [{:name "restic"}
-           {:name "postgresql-client-14"}]
-  :file [{:path "/usr/local/lib/functions.sh" :mod "400"}
-         {:path "/usr/local/lib/pg-functions.sh" :mod "400"}
-         {:path "/usr/local/lib/file-functions.sh" :mod "400"}]}