Skip to content
Snippets Groups Projects
Commit 35caafa3 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch '770-update-dockerfile-curl-version' into 'master'

Resolve "Update Dockerfile curl version"

Closes #770

See merge request openappstack/openappstack!391
parents 2e8b663f a3566620
No related branches found
No related tags found
No related merge requests found
......@@ -51,6 +51,7 @@ include:
- changes:
- .gitlab-ci.yml
- .gitlab/ci_scripts/*
- Dockerfile
- ansible/**/*
- flux/**/*
- test/**/*
......
FROM alpine:3.13
FROM alpine:3.13.5
LABEL name="OpenAppStack management"
LABEL version="4.1"
LABEL version="4.2"
LABEL vendor1="Greenhost"
# Download yq v4 from github until it's packaged in alpine > 3.13
ADD https://github.com/mikefarah/yq/releases/download/v4.6.2/yq_linux_amd64 /usr/local/bin/yq
ADD https://github.com/mikefarah/yq/releases/download/v4.7.0/yq_linux_amd64 /usr/local/bin/yq
COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem
COPY ./requirements.txt /requirements.txt
RUN \
......@@ -14,9 +14,9 @@ RUN \
cargo=~1.47.0-r2 \
chromium=~86.0.4240.111-r0 \
chromium-chromedriver=~86.0.4240.111-r0 \
curl=~7.74.0-r1 \
curl=~7.76.1-r0 \
# needed for installing pycurl python module
curl-dev=~7.74.0-r1 \
curl-dev=~7.76.1-r0 \
gcc=~10.2.1_pre1-r3 \
git=~2.30.2-r0 \
libffi-dev=3.3-r2 \
......@@ -32,4 +32,3 @@ RUN \
update-ca-certificates && \
pip install --no-cache-dir -r /requirements.txt && \
ln -s /usr/bin/python3 /usr/bin/python
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment