Merge branch 'main' of ssh://repo.prod.meissa.de:2222/meissa/c4k-website

README.md

@@ -2,7 +2,7 @@
 
 [![Clojars Project](https://img.shields.io/clojars/v/org.domaindrivenarchitecture/c4k-website.svg)](https://clojars.org/org.domaindrivenarchitecture/c4k-website) [![pipeline status](https://gitlab.com/domaindrivenarchitecture/c4k-website/badges/master/pipeline.svg)](https://gitlab.com/domaindrivenarchitecture/c4k-website/-/commits/main) 
 
-[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa-gmbh.de/img/community/Mastodon_Logotype.svg" width=20 alt="team@social.meissa-gmbh.de"> team@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@team) | [Website & Blog](https://domaindrivenarchitecture.org)
+[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa.de/images/parts/contact/mastodon36_hue9b2464f10b18e134322af482b9c915e_5501_filter_14705073121015236177.png" width=20 alt="M"> meissa@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@meissa) | [Blog](https://domaindrivenarchitecture.org) | [Website](https://meissa.de)
 
 ## Purpose
 

infrastructure/build/build.py

@@ -7,7 +7,7 @@ import logging
 name = 'c4k-website'
 MODULE = 'build'
 PROJECT_ROOT_PATH = '../..'
-version = "2.0.1"
+version = "2.0.4-dev"
 
 
 @init

infrastructure/build/image/Dockerfile

@@ -4,9 +4,11 @@ FROM clojure:lein
 ADD resources /tmp
 
 ENV HUGO_VERSION="0.125.5"
+ENV GO_VERSION="1.19.13"
 ENV BUILDDIR="/etc/website"
 ENV SOURCEDIR="/etc/websitesource"
 ENV WEBSITEROOT="/var/www/html/website/"
 ENV HASHFILEDIR="/var/hashfile.d"
+ENV PATH="${PATH}:/usr/local/go/bin"
 
 RUN /tmp/install.sh

infrastructure/build/image/resources/functions.sh

@@ -47,5 +47,23 @@ function install-hugo-from-deb() {
     echo "Clean up"
     rm hugo_extended_${HUGO_VERSION}_linux-amd64.deb
     rm checksums.txt
-
+}
+
+function install-go-from-tar() {
+    curl -L "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz" -o go_linux-amd64.tar.gz
+    EXPECTED_CHECKSUM="4643d4c29c55f53fa0349367d7f1bb5ca554ea6ef528c146825b0f8464e2e668  go_linux-amd64.tar.gz"
+    ACTUAL_CHECKSUM="$(sha256sum go_linux-amd64.tar.gz)"
+    if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+    then
+        >&2 echo 'ERROR: Invalid installer checksum'
+        rm go_linux-amd64.tar.gz
+        exit 1
+    fi
+
+    echo "Installing go"
+    echo
+    tar -C /usr/local -xzf go_linux-amd64.tar.gz
+
+    echo "Clean up"
+    rm go_linux-amd64.tar.gz
 }

infrastructure/build/image/resources/install.sh

@@ -6,8 +6,9 @@ function main()
 {
     {
         upgradeSystem
-        apt-get install -qqy unzip rsync jq imagemagick curl
+        apt-get install -qqy unzip rsync jq imagemagick curl git
         install-hugo-from-deb
+        install-go-from-tar
 
         install -d /etc/lein/
         install -m 0700 /tmp/entrypoint.sh /

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-website",
     "description": "Generate c4k yaml for a website deployment.",
     "author": "meissa GmbH",
-    "version": "2.0.1",
+    "version": "2.0.4-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-website#readme",
     "repository": "https://www.npmjs.com/package/c4k-website",
     "license": "APACHE2",

project.clj

@@ -1,4 +1,4 @@
-(defproject org.domaindrivenarchitecture/c4k-website "2.0.1"
+(defproject org.domaindrivenarchitecture/c4k-website "2.0.4-SNAPSHOT"
   :description "website c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
@@ -33,17 +33,4 @@
                   ["vcs" "commit"]
                   ["vcs" "tag" "v" "--no-sign"]
                   ["change" "version" "leiningen.release/bump-version"]]
-  ;; TODO: das ist intentionally nach pyb gewandert und muss hier raus!
-  :aliases {"native" ["shell"
-                      "native-image"
-                      "--report-unsupported-elements-at-runtime"
-                      "--initialize-at-build-time"
-                      "-jar" "target/uberjar/c4k-website-standalone.jar"
-                      "-H:ResourceConfigurationFiles=graalvm-resource-config.json"
-                      "-H:Log=registerResource"
-                      "-H:Name=target/graalvm/${:name}"]
-            "inst" ["shell"
-                    "sh"
-                    "-c"
-                    "lein uberjar && sudo install -m=755 target/uberjar/c4k-website-standalone.jar /usr/local/bin/c4k-website-standalone.jar"]}
   )

src/main/cljc/dda/c4k_website/core.cljc

@@ -29,7 +29,6 @@
 (s/def ::build-memory-request ::web/build-memory-request)
 (s/def ::build-cpu-limit ::web/build-cpu-limit)
 (s/def ::build-memory-limit ::web/build-memory-limit)
-;; TODO: Redirect fehlt!
 (s/def ::redirects ::web/redirects)
 
 (def websiteconfig? (s/keys :req-un [::unique-name

src/main/resources/website/build-cron.yaml

@@ -11,6 +11,7 @@ spec:
   failedJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      activeDeadlineSeconds: 415
       template:
         metadata:
           namespace: NAME

src/test/cljc/dda/c4k_website/website_test.cljc

@@ -196,7 +196,8 @@
            :failedJobsHistoryLimit 1,
            :jobTemplate
            {:spec
-            {:template
+            {:activeDeadlineSeconds 415,
+             :template
              {:metadata
               {:namespace "test-io",
                :labels