.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
   - image
 
 .img: &img
-  image: "domaindrivenarchitecture/ddadevops-dind:4.10.5"
+  image: "domaindrivenarchitecture/ddadevops-dind:4.7.4"
   services:
     - docker:dind
   before_script:
@@ -16,7 +16,7 @@ stages:
   - export IMAGE_TAG=$CI_COMMIT_TAG
 
 .cljs-job: &cljs
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
+  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.4"
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
@@ -29,7 +29,7 @@ stages:
   - npm install
 
 .clj-job: &clj
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
+  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.4"
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:

infrastructure/backup/image/Dockerfile

@@ -1,4 +1,4 @@
-FROM domaindrivenarchitecture/dda-backup:latest
+FROM domaindrivenarchitecture/dda-backup:1.0.9
 
 # Prepare Entrypoint Script
 ADD resources /tmp

infrastructure/backup/image/resources/backup.sh

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

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

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -Eexo pipefail
-
 function main() {
     create-pg-pass
 

infrastructure/backup/image/resources/entrypoint.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -Eexo pipefail
-
 function main() {
     create-pg-pass
 

infrastructure/backup/image/resources/init.sh

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

infrastructure/backup/image/resources/install.sh

@@ -1,21 +1,13 @@
 #!/bin/bash
 
-set -exo pipefail
+set -eux pipefail
 
-function main()
+apt-get update > /dev/null;
-{
-    upgradeSystem
-    
-    install -m 0700 /tmp/entrypoint.sh /
-    install -m 0700 /tmp/entrypoint-start-and-wait.sh /
 
-    install -m 0700 /tmp/init.sh /usr/local/bin/
+install -m 0700 /tmp/entrypoint.sh /
-    install -m 0700 /tmp/backup.sh /usr/local/bin/
+install -m 0700 /tmp/entrypoint-start-and-wait.sh /
-    install -m 0700 /tmp/restore.sh /usr/local/bin/
-    install -m 0700 /tmp/restic-snapshots.sh /usr/local/bin/
 
-    cleanupDocker
+install -m 0700 /tmp/init.sh /usr/local/bin/
-} > /dev/null
+install -m 0700 /tmp/backup.sh /usr/local/bin/
-
+install -m 0700 /tmp/restore.sh /usr/local/bin/
-source /tmp/install_functions_debian.sh
+install -m 0700 /tmp/restic-snapshots.sh /usr/local/bin/
-DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main

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

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

infrastructure/backup/image/resources/restore.sh

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

infrastructure/backup/test/Dockerfile

@@ -0,0 +1,11 @@
+FROM c4k-forgejo-backup
+
+RUN apt update
+RUN apt -yqq --no-install-recommends --yes install 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

infrastructure/federated/image/Dockerfile

@@ -15,8 +15,6 @@ ENV FORGEJO_BRANCH "forgejo-federated-star"
 #ENV FORGEJO_BRANCH "libreplanet-federation-demo"
 
 #Build deps
-RUN apk -U upgrade
-RUN apk cache clean
 RUN apk --no-cache add build-base git nodejs npm
 
 #Setup repo

infrastructure/federated/test/Dockerfile

@@ -0,0 +1,10 @@
+FROM c4k-forgejo-federated
+
+RUN apk --no-cache add openjdk11-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