diff --git a/infrastructure/c4k-website-build/test/Dockerfile b/infrastructure/c4k-website-build/test/Dockerfile index d92d6c3..41aadf5 100644 --- a/infrastructure/c4k-website-build/test/Dockerfile +++ b/infrastructure/c4k-website-build/test/Dockerfile @@ -1,13 +1,8 @@ FROM c4k-website-build -# Prepare Entrypoint Script -ADD resources /tmp - -RUN /tmp/install.sh RUN apt update RUN apt -yqq --no-install-recommends --yes install curl default-jre-headless - RUN curl -L -o /tmp/serverspec.jar \ https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar diff --git a/infrastructure/c4k-website-build/test/resources/entrypoint.sh b/infrastructure/c4k-website-build/test/resources/entrypoint.sh deleted file mode 100755 index 871a00d..0000000 --- a/infrastructure/c4k-website-build/test/resources/entrypoint.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -mkdir $BUILDDIR -mkdir $SOURCEDIR - -set -euo pipefail - -source /usr/local/bin/functions.sh - -filename="website.zip" -hashfilename="hashfile" - -echo "Check for new content" -touch $HASHFILEDIR/$hashfilename -currentHash=$( cat $HASHFILEDIR/$hashfilename ) -newHash=$( get-hash-data ) - -if [[ $currentHash == $newHash ]] - then - echo "Nothing to do" - else - write-hash-data $currentHash $hashfilename - echo "Downloading website data" - get-website-data $filename - unzip-website-data $filename - echo "Executing Custom Scripts, if applicable" - execute-scripts-when-existing - echo "Building website" - build-website - echo "Moving files" - move-website-files-to-target -fi - - - - diff --git a/infrastructure/c4k-website-build/test/resources/exclude.pattern b/infrastructure/c4k-website-build/test/resources/exclude.pattern deleted file mode 100644 index 3978a0f..0000000 --- a/infrastructure/c4k-website-build/test/resources/exclude.pattern +++ /dev/null @@ -1,2 +0,0 @@ -.git -.gitignore diff --git a/infrastructure/c4k-website-build/test/resources/functions.sh b/infrastructure/c4k-website-build/test/resources/functions.sh deleted file mode 100644 index 7ab68db..0000000 --- a/infrastructure/c4k-website-build/test/resources/functions.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -function get-website-data() { - curl -H "Authorization: token $AUTHTOKEN" -o $SOURCEDIR/$1 $GITREPOURL -} - -function get-hash-data() { - curl -s -H "Authorization: token $AUTHTOKEN" $GITCOMMITURL | jq '.sha' -} - -function write-hash-data() { - echo $1 > $HASHFILEDIR/$2 -} - -function unzip-website-data() { - unzip $SOURCEDIR/$1 -d $BUILDDIR -} - -function execute-scripts-when-existing() { - websitedir=$(ls $BUILDDIR) - if [[ -f $BUILDDIR/$websitedir/$SCRIPTFILE ]] - then - checksum="$(sha256sum $BUILDDIR/$websitedir/$SCRIPTFILE | grep -oE "^[a-z0-9]+")" - if [[ "$SHA256SUM" == "$checksum" ]] - then - chmod +x $BUILDDIR/$websitedir/$SCRIPTFILE - (cd $BUILDDIR; dir=$(ls); cd $dir; ./$SCRIPTFILE) #make sure paths defined in scriptfile are relative to $dir - else - printf "Provided SHA256 Sum does not match calculated sum. Exiting." - printf "Calculated SHA256: $checksum" - printf "Given SHA256: $SHA256SUM" - exit 1 - fi - else - printf "No script file provided." - fi -} - -function build-website() { - (cd $BUILDDIR; dir=$(ls); cd $dir; lein run;) -} - -function move-website-files-to-target() { - (cd $BUILDDIR; dir=$(ls); cd $dir; rsync -ru --exclude-from "/etc/exclude.pattern" --delete resources/public/* $WEBSITEROOT;) -} diff --git a/infrastructure/c4k-website-build/test/resources/install.sh b/infrastructure/c4k-website-build/test/resources/install.sh deleted file mode 100755 index fddcecb..0000000 --- a/infrastructure/c4k-website-build/test/resources/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -mkdir /etc/lein/ - -install -m 0700 /tmp/entrypoint.sh / -install -m 0700 /tmp/functions.sh /usr/local/bin/ -install -m 0700 /tmp/exclude.pattern /etc/ -install -m 0700 /tmp/project.clj /etc/lein/ diff --git a/infrastructure/c4k-website-build/test/resources/project.clj b/infrastructure/c4k-website-build/test/resources/project.clj deleted file mode 100644 index 403046f..0000000 --- a/infrastructure/c4k-website-build/test/resources/project.clj +++ /dev/null @@ -1,11 +0,0 @@ -(defproject org.domaindrivenarchitecture/c4k-website-build "0.1.1-SNAPSHOT" - :description "website c4k-build package" - :url "https://domaindrivenarchitecture.org" - :license {:name "Apache License, Version 2.0" - :url "https://www.apache.org/licenses/LICENSE-2.0.html"} - :dependencies [[org.clojure/clojure "1.9.0"] - [dda/cryogen-bootstrap "0.1.5"]] - :plugins [[lein-ring "0.12.5"]] - :main cryogen.core - :ring {:init cryogen.server/init - :handler cryogen.server/handler})