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

Merge branch '818-upgrade-to-alpine-3-14' into 'master'

Resolve "Upgrade to alpine 3.14"

Closes #818

See merge request openappstack/openappstack!421
parents c7963cee 35fb5202
No related branches found
No related tags found
No related merge requests found
FROM alpine:3.13.5
FROM alpine:3.14
LABEL name="OpenAppStack management"
LABEL version="4.3.1"
LABEL version="4.4"
LABEL vendor1="Greenhost"
ENV TAIKO_SKIP_CHROMIUM_DOWNLOAD=true
ENV TAIKO_BROWSER_PATH=/usr/bin/chromium-browser
ENV TAIKO_BROWSER_ARGS=--no-sandbox,--start-maximized,--disable-dev-shm-usage,--ignore-certificate-errors
# 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/
......@@ -17,24 +15,23 @@ 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.0-r0 \
cargo=~1.47.0-r2 \
chromium=~86.0.4240.111-r0 \
bash=~5.1.4-r0 \
cargo=~1.52.0-r0 \
chromium=~91.0.4472.101-r0 \
curl=~7.77.0-r1 \
# needed for installing pycurl python module
curl-dev=~7.77.0-r1 \
gcc=~10.2.1_pre1-r3 \
git=~2.30.2-r0 \
gcc=~10.3.1_git20210424-r2 \
git=~2.32.0-r0 \
libffi-dev=3.3-r2 \
make=~4.3-r0 \
musl-dev=~1.2.2-r1 \
npm=~14.16.1-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 && \
musl-dev=~1.2.2-r3 \
npm=~7.17.0-r0 \
openssh-client=~8.6_p1-r2 \
py3-pip=~20.3.4-r1 \
python3-dev=~3.9.5-r1 \
rsync=~3.2.3-r2 \
yq=4.6.3-r1 && \
rm -rf /var/cache/* && \
mkdir /var/cache/apk && \
chmod a+x /usr/local/bin/* && \
......
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