From 457b106829f4c6c9aa10d0e5c0b09787eb92a756 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:07:33 +0200 Subject: [PATCH 1/6] Install go 1.19.13 --- infrastructure/build/image/Dockerfile | 2 ++ .../build/image/resources/functions.sh | 20 ++++++++++++++++++- .../build/image/resources/install.sh | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) 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..a900ca8 100755 --- a/infrastructure/build/image/resources/install.sh +++ b/infrastructure/build/image/resources/install.sh @@ -8,6 +8,7 @@ function main() upgradeSystem apt-get install -qqy unzip rsync jq imagemagick curl install-hugo-from-deb + install-go-from-tar install -d /etc/lein/ install -m 0700 /tmp/entrypoint.sh / From a84ef439cb84bacdff77e213371539ebfaa3f77a Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:08:26 +0200 Subject: [PATCH 2/6] release: 2.0.2 --- infrastructure/build/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/build/build.py b/infrastructure/build/build.py index c0e498d..d794aa5 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.2" @init diff --git a/package.json b/package.json index 625de53..c225284 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.2", "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..4ab1543 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.2" :description "website c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 76882ba19606de6f3303d6d3507f9052fe205c6b Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:08:26 +0200 Subject: [PATCH 3/6] bump version to: 2.0.3-SNAPSHOT --- infrastructure/build/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/build/build.py b/infrastructure/build/build.py index d794aa5..3f0c952 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" +version = "2.0.3-dev" @init diff --git a/package.json b/package.json index c225284..0a04900 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", + "version": "2.0.3-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 4ab1543..19ca9d2 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-website "2.0.2" +(defproject org.domaindrivenarchitecture/c4k-website "2.0.3-SNAPSHOT" :description "website c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 1f8ced4e6d2663f70a9e79cfa74a540f28d20b61 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:33:49 +0200 Subject: [PATCH 4/6] Add git to image --- infrastructure/build/image/resources/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/build/image/resources/install.sh b/infrastructure/build/image/resources/install.sh index a900ca8..afa2e89 100755 --- a/infrastructure/build/image/resources/install.sh +++ b/infrastructure/build/image/resources/install.sh @@ -6,7 +6,7 @@ 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 From 84646748f23e6daee666d0bb70295ee510fb2ed9 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:34:49 +0200 Subject: [PATCH 5/6] release: 2.0.3 --- infrastructure/build/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/build/build.py b/infrastructure/build/build.py index 3f0c952..6966c23 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.3-dev" +version = "2.0.3" @init diff --git a/package.json b/package.json index 0a04900..83fbff3 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.3-SNAPSHOT", + "version": "2.0.3", "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 19ca9d2..cecfbfe 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-website "2.0.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-website "2.0.3" :description "website c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 87a18c40104fe05a20e18f291b32d5e7a0c18c4c Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 May 2024 12:34:49 +0200 Subject: [PATCH 6/6] bump version to: 2.0.4-SNAPSHOT --- infrastructure/build/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/build/build.py b/infrastructure/build/build.py index 6966c23..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.3" +version = "2.0.4-dev" @init diff --git a/package.json b/package.json index 83fbff3..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.3", + "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 cecfbfe..f0f4f05 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-website "2.0.3" +(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"