Compare commits
No commits in common. "76882ba19606de6f3303d6d3507f9052fe205c6b" and "f78e089639090b3e081bdd1281c4857a6568956b" have entirely different histories.
76882ba196
...
f78e089639
6 changed files with 4 additions and 25 deletions
|
@ -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.3-dev"
|
version = "2.0.2-dev"
|
||||||
|
|
||||||
|
|
||||||
@init
|
@init
|
||||||
|
|
|
@ -4,11 +4,9 @@ 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
|
||||||
|
|
|
@ -47,23 +47,5 @@ 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
|
|
||||||
}
|
}
|
|
@ -8,7 +8,6 @@ function main()
|
||||||
upgradeSystem
|
upgradeSystem
|
||||||
apt-get install -qqy unzip rsync jq imagemagick curl
|
apt-get install -qqy unzip rsync jq imagemagick curl
|
||||||
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,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.3-SNAPSHOT",
|
"version": "2.0.2-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",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
(defproject org.domaindrivenarchitecture/c4k-website "2.0.3-SNAPSHOT"
|
(defproject org.domaindrivenarchitecture/c4k-website "2.0.2-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"
|
||||||
|
|
Loading…
Reference in a new issue