Merge branch 'devops/dependancy-update' into 'dev'

Add openjdk-17 to docker image

See merge request crafty-controller/crafty-commander!107
This commit is contained in:
Iain Powrie 2021-12-04 00:22:49 +00:00
commit 7c3301f220
2 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@
docker/
.dockerignore
Dockerfile
docker-compose.yml
# git & gitlab related
.git/

View File

@ -2,9 +2,11 @@ FROM python:alpine
LABEL maintainer="Dockerfile created by Zedifus <https://gitlab.com/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 \