diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca2a6712b498fd5ad3af41f2e92122fb8882993d..ab30333d658f2e6c6c22973763d66c7185f65c75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,7 @@ include: - changes: - .gitlab-ci.yml - .gitlab/ci_scripts/* + - Dockerfile - ansible/**/* - flux/**/* - test/**/* diff --git a/Dockerfile b/Dockerfile index 23feb62a32ab5302a4865074961cacb66bd3c0ea..5b66aecfe86baf8b4e7c944b63dd4bad438b8b43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -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 -