diff --git a/Dockerfile b/Dockerfile index 03ba73467549ae3ebcd4a0264793e32148d1f953..56a5130d85b3211677c47d3c29b5c5e3ef4f9708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ -FROM alpine:3.14 +FROM alpine:3.13.5 LABEL name="OpenAppStack management" -LABEL version="4.4" +LABEL version="4.3" 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.7.0/yq_linux_amd64 /usr/local/bin/yq ADD https://github.com/fluxcd/flux2/releases/download/v0.14.2/flux_0.14.2_linux_amd64.tar.gz /tmp/ # Download kubectl until it's packaged in alpine > 3.14 ADD https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl /usr/local/bin/ @@ -12,20 +14,24 @@ COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-sta COPY ./requirements.txt /requirements.txt RUN \ apk --no-cache add \ - bash=~5.1.4-r0 \ - cargo=~1.52.0-r0 \ + bash=5.1.0-r0 \ + cargo=~1.47.0-r2 \ + chromium=~86.0.4240.111-r0 \ + chromium-chromedriver=~86.0.4240.111-r0 \ curl=~7.77.0-r1 \ # needed for installing pycurl python module curl-dev=~7.77.0-r1 \ - git=~2.32.0-r0 \ + gcc=~10.2.1_pre1-r3 \ + git=~2.30.2-r0 \ libffi-dev=3.3-r2 \ make=~4.3-r0 \ - openssh-client=~8.6_p1-r2 \ - py3-pip=~20.3.4-r1 \ - py3-wheel=~0.36.2-r2 \ - python3-dev=~3.9.5-r1 \ - rsync=~3.2.3-r2 \ - yq=4.6.3-r1 && \ + musl-dev=~1.2.2-r1 \ + openssh-client=~8.4_p1-r3 \ + py3-pip=~20.3.4-r0 \ + py3-wheel=~0.36.2-r0 \ + python3-dev=~3.8.10-r0 \ + rsync=~3.2.3-r1 \ + rust=~1.47.0-r2 && \ chmod a+x /usr/local/bin/* && \ update-ca-certificates && \ pip install --no-cache-dir -r /requirements.txt && \