From 30d9466835e55e9c48cc40d1201cc55060348f77 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Fri, 19 Mar 2021 12:57:07 +0100
Subject: [PATCH] Add yq for modifying yaml files

---
 Dockerfile | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09c5dddc7..0e932477b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,34 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 LABEL name="OpenAppStack management"
-LABEL version="4.0"
+LABEL version="4.1"
 LABEL vendor1="Greenhost"
 
-RUN apk --no-cache add \
-  cargo \
-  chromium \
-  chromium-chromedriver \
-  curl \
-  # needed for installing pycurl python module
-  curl-dev \
-  gcc \
-  git \
-  libffi-dev \
-  make \
-  musl-dev \
-  openssh-client \
-  openssl-dev \
-  py3-pip \
-  python3-dev \
-  rsync \
-  rust
 
+# 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
 COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem
-RUN update-ca-certificates
 COPY ./requirements.txt /requirements.txt
-RUN pip install -r /requirements.txt
-RUN ln -s /usr/bin/python3 /usr/bin/python
+RUN \
+  apk --no-cache add \
+    cargo=~1.47.0-r2 \
+    chromium=~86.0.4240.111-r0 \
+    chromium-chromedriver=~86.0.4240.111-r0 \
+    curl=~7.74.0-r1 \
+    # needed for installing pycurl python module
+    curl-dev=~7.74.0-r1 \
+    gcc=~10.2.1_pre1-r3 \
+    git=~2.30.2-r0 \
+    libffi-dev=3.3-r2 \
+    make=~4.3-r0 \
+    musl-dev=~1.2.2-r0 \
+    openssh-client=~8.4_p1-r2 \
+    py3-pip=~20.3.4-r0 \
+    py3-wheel=~0.36.2-r0 \
+    python3-dev=~3.8.8-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 && \
+  ln -s /usr/bin/python3 /usr/bin/python
-- 
GitLab