diff --git a/infrastructure/build/build.py b/infrastructure/build/build.py index c0e498d..7bfe761 100644 --- a/infrastructure/build/build.py +++ b/infrastructure/build/build.py @@ -7,7 +7,7 @@ import logging name = 'c4k-website' MODULE = 'build' PROJECT_ROOT_PATH = '../..' -version = "2.0.2-dev" +version = "2.0.4-dev" @init diff --git a/infrastructure/build/image/Dockerfile b/infrastructure/build/image/Dockerfile index 34fc9e3..478305f 100644 --- a/infrastructure/build/image/Dockerfile +++ b/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 diff --git a/infrastructure/build/image/resources/functions.sh b/infrastructure/build/image/resources/functions.sh index e857062..17bf51a 100644 --- a/infrastructure/build/image/resources/functions.sh +++ b/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 +} \ No newline at end of file diff --git a/infrastructure/build/image/resources/install.sh b/infrastructure/build/image/resources/install.sh index ae19d85..afa2e89 100755 --- a/infrastructure/build/image/resources/install.sh +++ b/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 / diff --git a/package.json b/package.json index 625de53..2ecbc27 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-website", "description": "Generate c4k yaml for a website deployment.", "author": "meissa GmbH", - "version": "2.0.2-SNAPSHOT", + "version": "2.0.4-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-website#readme", "repository": "https://www.npmjs.com/package/c4k-website", "license": "APACHE2", diff --git a/project.clj b/project.clj index 78dca65..f0f4f05 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-website "2.0.2-SNAPSHOT" +(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"