meissa/c4k-website
6
5
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

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

Browse source
This commit is contained in:
erik 2024-05-03 15:31:02 +02:00
commit 89cd45fdd3
6 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/build/build.py
View file

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

2
infrastructure/build/image/Dockerfile
View file

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

20
infrastructure/build/image/resources/functions.sh
View file

@ -47,5 +47,23 @@ function install-hugo-from-deb() {
echo "Clean up" echo "Clean up"
rm hugo_extended_${HUGO_VERSION}_linux-amd64.deb rm hugo_extended_${HUGO_VERSION}_linux-amd64.deb
rm checksums.txt 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
} }

3
infrastructure/build/image/resources/install.sh
View file

@ -6,8 +6,9 @@ function main()
{ {
{ {
upgradeSystem 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-hugo-from-deb
install-go-from-tar
install -d /etc/lein/ install -d /etc/lein/
install -m 0700 /tmp/entrypoint.sh / install -m 0700 /tmp/entrypoint.sh /

2
package.json
View file

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

2
project.clj
View file

@ -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" :description "website c4k-installation package"
:url "https://domaindrivenarchitecture.org" :url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0" :license {:name "Apache License, Version 2.0"