From c8d88670859ddb02b3b50df4ae0d3e80cc80bdfe Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 4 Dec 2021 00:07:57 +0000 Subject: [PATCH 1/2] Add openjdk17-jre-headless This is to support latest mc patch 1.18, also tidy initial RUN a little, to separate deps, for readablity. --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb6f366d..ba7278be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,11 @@ FROM python:alpine LABEL maintainer="Dockerfile created by Zedifus " -# Install Packages, Build Dependencies & Garbage Collect & Harden +# Install Packages & Garbage Collect Compile Deps & Harden COPY requirements.txt /commander/requirements.txt -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/latest-stable/community llvm11-libs openssl-dev rust cargo gcc musl-dev libffi-dev make openjdk8-jre-base openjdk11-jre-headless openjdk16-jre-headless mariadb-dev \ +RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/latest-stable/community \ +gcc musl-dev libffi-dev make rust cargo openssl-dev llvm11-libs \ +openjdk8-jre-base openjdk11-jre-headless openjdk16-jre-headless openjdk17-jre-headless mariadb-dev \ && pip3 install --no-cache-dir -r /commander/requirements.txt \ && apk del --no-cache gcc musl-dev libffi-dev make rust cargo openssl-dev llvm11-libs \ && rm -rf /sbin/apk \ From 50da1d9252ef260b555a1f8a8c730cea62331d22 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 4 Dec 2021 00:16:16 +0000 Subject: [PATCH 2/2] Add compose file to dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 8f93eaad..79673e81 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,7 @@ docker/ .dockerignore Dockerfile +docker-compose.yml # git & gitlab related .git/