diff --git a/infrastructure/clojure/image/Dockerfile b/infrastructure/clojure/image/Dockerfile index 8aa0d0d..ff83d09 100644 --- a/infrastructure/clojure/image/Dockerfile +++ b/infrastructure/clojure/image/Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-buster-slim +FROM node:lts-bookworm-slim ADD resources /tmp RUN /tmp/install.sh \ No newline at end of file diff --git a/infrastructure/clojure/image/resources/CHECKSUMS b/infrastructure/clojure/image/resources/CHECKSUMS index 9f5878e..6109221 100644 --- a/infrastructure/clojure/image/resources/CHECKSUMS +++ b/infrastructure/clojure/image/resources/CHECKSUMS @@ -1,2 +1 @@ -d7a5cb848b783c15119316d716d8a74bf11c9e3ab050f3adf28e0678a6018467 kubeconform-v0.4.7.tar.gz -bbd3e03025168172a76c2a29e6a14c1c37e3476b30774259c3ef5952fb86f470 graalvm-ce-java11-linux-amd64-21.2.0.tar.gz +478604fe85c711aafe8ef78c0bf25cb93fa46de5a3c07040f25a595096c43f8a kubeconform-v0.6.3.tar.gz diff --git a/infrastructure/clojure/image/resources/install.sh b/infrastructure/clojure/image/resources/install.sh index f89293d..35bf74b 100755 --- a/infrastructure/clojure/image/resources/install.sh +++ b/infrastructure/clojure/image/resources/install.sh @@ -5,41 +5,29 @@ function main() { upgradeSystem mkdir -p /usr/share/man/man1 - apt -qqy install openjdk-11-jre-headless leiningen curl build-essential libz-dev zlib1g-dev + apt -qqy install openjdk-17-jre-headless leiningen curl build-essential libz-dev zlib1g-dev # shadow-cljs npm install -g --save-dev shadow-cljs # download kubeconform & graalvm - curl -Lo /tmp/kubeconform-v0.4.7.tar.gz https://github.com/yannh/kubeconform/releases/download/v0.4.7/kubeconform-linux-amd64.tar.gz - curl -Lo /tmp/graalvm-ce-java11-linux-amd64-21.2.0.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-linux-amd64-21.2.0.tar.gz - + curl -Lo /tmp/kubeconform-v0.6.3.tar.gz https://github.com/yannh/kubeconform/releases/download/v0.6.3/kubeconform-linux-amd64.tar.gz + # checksum cd /tmp sha256sum --check CHECKSUMS # install kubeconform - tar -xf /tmp/kubeconform-v0.4.7.tar.gz + tar -xf /tmp/kubeconform-v0.6.3.tar.gz cp kubeconform /usr/local/bin - # install graalvm - tar -xzf graalvm-ce-java11-linux-amd64-21.2.0.tar.gz - mv graalvm-ce-java11-21.2.0 /usr/lib/jvm/ - ln -s /usr/lib/jvm/graalvm-ce-java11-21.2.0 /usr/lib/jvm/graalvm - ln -s /usr/lib/jvm/graalvm/bin/gu /usr/local/bin - - update-alternatives --install /usr/bin/java java /usr/lib/jvm/graalvm/bin/java 2 - - gu install native-image - ln -s /usr/lib/jvm/graalvm/bin/native-image /usr/local/bin - #install lein /tmp/lein.sh #install pyb apt -qqy install python3 python3-pip git; python3 -m pip install -U pip; - pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection; + pip3 install pybuilder 'ddadevops>=4.2.0' deprecation dda-python-terraform boto3 pyyaml inflection; cleanupDocker }