From 97712c77f8dad9c73a8a5c51cce35ef37ad31a65 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 27 Sep 2021 15:12:26 +0200
Subject: [PATCH] Update chromium, curl, yq in container image
Fixes: #951
---
Dockerfile | 9 +++++----
.../local-path-provisioner-values-configmap.yaml | 5 ++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 48b5e5eaa..7194ded0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+# https://hub.docker.com/_/alpine?tab=tags
FROM alpine:3.14
LABEL name="OpenAppStack management"
@@ -17,10 +18,10 @@ RUN \
apk --no-cache add \
bash=~5.1.4-r0 \
cargo=~1.52.1-r1 \
- chromium=~91.0.4472.164-r0 \
- curl=~7.78.0-r0 \
+ chromium=~93.0.4577.82-r0 \
+ curl=~7.79.1-r0 \
# needed for installing pycurl python module
- curl-dev=~7.78.0-r0 \
+ curl-dev=~7.79.1-r0 \
# Needed for "unbuffer" to timestamp cmds
expect=~5.45.4-r0 \
gcc=~10.3.1_git20210424-r2 \
@@ -35,7 +36,7 @@ RUN \
py3-pip=~20.3.4-r1 \
python3-dev=~3.9.5-r1 \
rsync=~3.2.3-r4 \
- yq=4.6.3-r1 && \
+ yq=4.6.3-r2 && \
rm -rf /var/cache/* && \
mkdir /var/cache/apk && \
chmod a+x /usr/local/bin/* && \
diff --git a/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml b/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
index 62b6d675e..b80032123 100644
--- a/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
+++ b/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
@@ -12,10 +12,9 @@ data:
storageClass:
defaultClass: true
# We temporarily use our own build in order to use local volumes instead of
- # hostPath.
+ # hostPath, see https://github.com/rancher/local-path-provisioner/issues/85
+ # and https://open.greenhost.net/openappstack/openappstack/-/issues/773
image:
- # We need to use our own fork of the local-path-provisioner until
- # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
repository: "open.greenhost.net:4567/openappstack/local-path-provisioner/local-path-provisioner"
# Make sure this tag is the same as the tag for the chart in the
# local-path-provisioner GitRepository
--
GitLab