Merge pull request #815 from vlche/master

Alpine 3.12
This commit is contained in:
Khanh Ngo 2020-10-10 14:01:42 +02:00 committed by GitHub
commit 58f3c241b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions

12
.whitesource Normal file
View File

@ -0,0 +1,12 @@
{
"scanSettings": {
"baseBranches": []
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff"
},
"issueSettings": {
"minSeverityLevel": "LOW"
}
}

View File

@ -1,4 +1,4 @@
FROM alpine:3.11 AS builder FROM alpine:3.12 AS builder
LABEL maintainer="k@ndk.name" LABEL maintainer="k@ndk.name"
ARG BUILD_DEPENDENCIES="build-base \ ARG BUILD_DEPENDENCIES="build-base \
@ -17,8 +17,7 @@ ENV LC_ALL=en_US.UTF-8 \
FLASK_APP=/build/powerdnsadmin/__init__.py FLASK_APP=/build/powerdnsadmin/__init__.py
# Get dependencies # Get dependencies
RUN apk add --no-cache ${BUILD_DEPENDENCIES} && \ RUN apk add --no-cache ${BUILD_DEPENDENCIES}
ln -s /usr/bin/pip3 /usr/bin/pip
WORKDIR /build WORKDIR /build
@ -72,7 +71,7 @@ RUN pip install pip-autoremove && \
# Build image # Build image
FROM alpine:3.11 FROM alpine:3.12
ENV FLASK_APP=/app/powerdnsadmin/__init__.py ENV FLASK_APP=/app/powerdnsadmin/__init__.py