From 9de1a2839da72c5c6fdf5c8d6bb94f3dc059f25e Mon Sep 17 00:00:00 2001 From: Luke Else Date: Fri, 30 Jan 2026 11:46:17 +0000 Subject: [PATCH] feat: Removed unecessary containers --- base/Dockerfile | 4 +--- kotlin-dev/Dockerfile | 17 ----------------- kotlin/Dockerfile | 17 ----------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 kotlin-dev/Dockerfile delete mode 100644 kotlin/Dockerfile diff --git a/base/Dockerfile b/base/Dockerfile index a189c04..3313ceb 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,7 +1,6 @@ FROM alpine:edge RUN apk add --no-cache \ - bash \ curl \ helix \ shadow \ @@ -10,8 +9,7 @@ RUN apk add --no-cache \ build-base \ ca-certificates -RUN chsh -s /bin/bash RUN mkdir /app WORKDIR /app -CMD [ "/bin/bash" ] +CMD [ "/bin/sh" ] diff --git a/kotlin-dev/Dockerfile b/kotlin-dev/Dockerfile deleted file mode 100644 index 8b58006..0000000 --- a/kotlin-dev/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM git.luke-else.co.uk/luke-else/lab:latest - -RUN sudo apk add --no-cache unzip zip openjdk21 - -# Set Java environment variables -ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk -ENV PATH="$JAVA_HOME/bin:$PATH" - -# Install SDKMAN and use it to install Kotlin and Gradle -RUN curl -s "https://get.sdkman.io" | bash && \ - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \ - sdk install kotlin && \ - sdk install gradle" - -# Make SDKMAN tools available in PATH -ENV SDKMAN_DIR="/root/.sdkman" -ENV PATH="$SDKMAN_DIR/candidates/kotlin/current/bin:$SDKMAN_DIR/candidates/gradle/current/bin:$PATH" diff --git a/kotlin/Dockerfile b/kotlin/Dockerfile deleted file mode 100644 index 2821243..0000000 --- a/kotlin/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM git.luke-else.co.uk/luke-else/base:latest - -RUN apk add --no-cache unzip zip openjdk21 - -# Set Java environment variables -ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk -ENV PATH="$JAVA_HOME/bin:$PATH" - -# Install SDKMAN and use it to install Kotlin and Gradle -RUN curl -s "https://get.sdkman.io" | bash && \ - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \ - sdk install kotlin && \ - sdk install gradle" - -# Make SDKMAN tools available in PATH -ENV SDKMAN_DIR="/root/.sdkman" -ENV PATH="$SDKMAN_DIR/candidates/kotlin/current/bin:$SDKMAN_DIR/candidates/gradle/current/bin:$PATH" \ No newline at end of file