Merge branch 'master' into 'dev'

# Conflicts:
#   Dockerfile
This commit is contained in:
Andrew 2022-01-26 20:03:10 +00:00
commit 5dba7725ff

View File

@ -5,7 +5,8 @@ LABEL maintainer="Dockerfile created by Zedifus <https://gitlab.com/zedifus>"
# Security Patch for CVE-2021-44228 # Security Patch for CVE-2021-44228
ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
# Install Packages & Garbage Collect Compile Deps & Harden # Install Packages, Build Dependencies & Garbage Collect & Harden
# (Alpine Edge repo is needed because jre16 is new)
COPY requirements.txt /commander/requirements.txt COPY requirements.txt /commander/requirements.txt
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/latest-stable/community \ 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 \ gcc musl-dev libffi-dev make rust cargo openssl-dev llvm11-libs \