From c67c3b932cc0272b0c80f1daba2c3a63ef4e7194 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 22 Nov 2021 10:52:43 +0100
Subject: [PATCH] Update apks after alpine 3.15 update, add .dockerignore

---
 .dockerignore | 28 +++++++++++++++++++++++++---
 Dockerfile    | 34 ++++++++++++++++------------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a4fbe8645..b86de9451 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,25 @@
-venv
-clusters
-docs
+/ansible
+/venv
+/clusters
+/docs
+/.git
+/.direnv
+/.envrc
+/CHANGELOG.md
+/.direnv
+/Dockerfile
+/.dockerignore
+/flux2
+/.gitignore
+/.gitlab
+/.gitlab-ci.yml
+/.gitlint
+/install
+/Makefile
+/.pre-commit-config.yaml
+README.md
+/.renovaterc.json
+/.sourceignore
+/stackspin
+/upgrade-scripts
+VERSION
diff --git a/Dockerfile b/Dockerfile
index 5af3aee5a..0b14c5368 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,31 +13,29 @@ ADD https://github.com/fluxcd/flux2/releases/download/v0.20.1/flux_0.20.1_linux_
 COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem
 COPY ./requirements.txt /requirements.txt
 RUN \
-  # Install kubectl from alpine edge until 3.15 is released
-  apk --no-cache add kubectl=~1.22.3-r0 \
+  # Install kubectl from alpine edge until alpine 3.16 is released
+  apk --no-cache add kubectl=~1.22.4-r0 \
     --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing && \
   apk --no-cache add \
-    bash=~5.1.4-r0 \
-    cargo=~1.52.1-r1 \
-    chromium=~93.0.4577.82-r0 \
-    curl=~7.79.1-r0 \
+    bash=~5.1.8-r0 \
+    cargo=~1.56.1-r0 \
+    chromium=~93.0.4577.82-r2 \
+    curl=~7.80.0-r0 \
     # needed for installing pycurl python module
-    curl-dev=~7.79.1-r0 \
+    curl-dev=~7.80.0-r0 \
     # Needed for "unbuffer" to timestamp cmds
-    expect=~5.45.4-r0 \
-    gcc=~10.3.1_git20210424-r2 \
-    git=~2.32.0-r0 \
-    libffi-dev=3.3-r2 \
+    expect=~5.45.4-r2 \
+    git=~2.34.0-r0 \
+    libffi-dev=~3.4.2-r1 \
     make=~4.3-r0 \
     # Needed for timestamp cmd "ts"
-    moreutils=~0.65-r0 \
-    musl-dev=~1.2.2-r3 \
-    npm=~7.17.0-r0 \
-    openssh-client=~8.6_p1-r3 \
+    moreutils=~0.66-r0 \
+    npm=~8.1.3-r0 \
+    openssh-client-default=~8.8_p1-r1 \
     py3-pip=~20.3.4-r1 \
-    python3-dev=~3.9.5-r1 \
-    rsync=~3.2.3-r4 \
-    yq=4.6.3-r2 && \
+    python3-dev=~3.9.7-r3 \
+    rsync=~3.2.3-r5 \
+    yq=~4.14.1-r0 && \
   rm -rf /var/cache/* && \
   mkdir /var/cache/apk && \
   update-ca-certificates && \
-- 
GitLab