From dd5890658c65a9d562cad8359113f9ca283fb8b7 Mon Sep 17 00:00:00 2001 From: Kieran Wardle <23309814+KieranWardle@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:24:36 +0000 Subject: [PATCH] Removed node16 dockerfile (#59) --- Makefile | 7 ++-- README.md | 10 ------ jdk17-maven-node16/Dockerfile | 24 ------------- jdk17-maven-node16/mvn-entrypoint.sh | 50 -------------------------- jdk17-maven-node16/settings-docker.xml | 6 ---- 5 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 jdk17-maven-node16/Dockerfile delete mode 100644 jdk17-maven-node16/mvn-entrypoint.sh delete mode 100644 jdk17-maven-node16/settings-docker.xml diff --git a/Makefile b/Makefile index 6cc13ef..b839791 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -.PHONY: jdk17-maven-node16 jdk17-maven-node22 gcloud-firestore-emulator gcloud-pubsub-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv cloud-sdk-terraform eq-stub owasp-venom - -jdk17-maven-node16: - docker build ./jdk17-maven-node16 -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/jdk17-mvn-node16-npm:latest +.PHONY: jdk17-maven-node22 gcloud-firestore-emulator gcloud-pubsub-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv cloud-sdk-terraform eq-stub owasp-venom jdk17-maven-node22: docker build ./jdk17-maven-node22 -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/jdk17-mvn-node22-npm:latest @@ -41,4 +38,4 @@ eq-stub: owasp-venom: docker build ./owasp-venom -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/venom:latest -build-all: jdk17-maven-node16 gcloud-pubsub-emulator gcloud-firestore-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv-3.11 python-pipenv-3.12 cloud-sdk-terraform eq-stub owasp-venom +build-all: gcloud-pubsub-emulator gcloud-firestore-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv-3.11 python-pipenv-3.12 cloud-sdk-terraform eq-stub owasp-venom diff --git a/README.md b/README.md index d4b9aac..d7dda60 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,6 @@ This repo is where the rm team store their docker image files used in builds and tooling. -## [JDK 17 Maven Node 16](/jdk17-maven-node16) - -A tooling image with JDK, Maven, and Node version 16, to enable the building of JS front end resources in Java backend services. - -Build with - -```shell -make jdk17-maven-node16 -``` - ## [JDK 17 Maven Node 22](/jdk17-maven-node22) A tooling image with JDK, Maven, and Node version 22, to enable the building of JS front end resources in Java backend services. diff --git a/jdk17-maven-node16/Dockerfile b/jdk17-maven-node16/Dockerfile deleted file mode 100644 index aa59cdb..0000000 --- a/jdk17-maven-node16/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM eclipse-temurin:17.0.3_7-jdk - -ARG MAVEN_VERSION=3.8.6 -ARG USER_HOME_DIR="/root" -ARG SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26 -ARG BASE_URL=https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries - -RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ - && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ - && echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ - && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \ - && rm -f /tmp/apache-maven.tar.gz \ - && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ - && apt-get install -y nodejs - -ENV MAVEN_HOME /usr/share/maven -ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" - -COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh -COPY settings-docker.xml /usr/share/maven/ref/ - -ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] -CMD ["mvn"] diff --git a/jdk17-maven-node16/mvn-entrypoint.sh b/jdk17-maven-node16/mvn-entrypoint.sh deleted file mode 100644 index 9f87dfa..0000000 --- a/jdk17-maven-node16/mvn-entrypoint.sh +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -eu - -# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG} -# So the initial ~/.m2 is set with expected content. -# Don't override, as this is just a reference setup - -copy_reference_files() { - local log="$MAVEN_CONFIG/copy_reference_file.log" - local ref="/usr/share/maven/ref" - - if mkdir -p "${MAVEN_CONFIG}/repository" && touch "${log}" > /dev/null 2>&1 ; then - cd "${ref}" - local reflink="" - if cp --help 2>&1 | grep -q reflink ; then - reflink="--reflink=auto" - fi - if [ -n "$(find "${MAVEN_CONFIG}/repository" -maxdepth 0 -type d -empty 2>/dev/null)" ] ; then - # destination is empty... - echo "--- Copying all files to ${MAVEN_CONFIG} at $(date)" >> "${log}" - cp -rv ${reflink} . "${MAVEN_CONFIG}" >> "${log}" - else - # destination is non-empty, copy file-by-file - echo "--- Copying individual files to ${MAVEN_CONFIG} at $(date)" >> "${log}" - find . -type f -exec sh -eu -c ' - log="${1}" - shift - reflink="${1}" - shift - for f in "$@" ; do - if [ ! -e "${MAVEN_CONFIG}/${f}" ] || [ -e "${f}.override" ] ; then - mkdir -p "${MAVEN_CONFIG}/$(dirname "${f}")" - cp -rv ${reflink} "${f}" "${MAVEN_CONFIG}/${f}" >> "${log}" - fi - done - ' _ "${log}" "${reflink}" {} + - fi - echo >> "${log}" - else - echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..." - fi -} - -owd="$(pwd)" -copy_reference_files -unset MAVEN_CONFIG - -cd "${owd}" -unset owd - -exec "$@" diff --git a/jdk17-maven-node16/settings-docker.xml b/jdk17-maven-node16/settings-docker.xml deleted file mode 100644 index 586c587..0000000 --- a/jdk17-maven-node16/settings-docker.xml +++ /dev/null @@ -1,6 +0,0 @@ - - /usr/share/maven/ref/repository -