From 2fba8c099f3c7509459f61a4ef49666a789b4b0a Mon Sep 17 00:00:00 2001
From: yurak <devnulldevnull21@gmail.com>
Date: Sun, 11 Apr 2021 01:08:02 +0900
Subject: [PATCH] apk add in Dockerfile #395

---
 kubernetes/monitoring/jenkins/Dockerfile | 16 ++++++++++++++--
 kubernetes/monitoring/test/ab/Dockerfile |  7 ++++++-
 kubernetes/rabbitmq/Dockerfile           |  6 +++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/kubernetes/monitoring/jenkins/Dockerfile b/kubernetes/monitoring/jenkins/Dockerfile
index 41a0dfb7b..4238b0fff 100644
--- a/kubernetes/monitoring/jenkins/Dockerfile
+++ b/kubernetes/monitoring/jenkins/Dockerfile
@@ -1,6 +1,18 @@
 FROM jenkins/jenkins:2.285-alpine
 ARG BUILD_DATE
 ARG VCS_REF
+
+# renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
+ENV TZDATA_VERSION="2021a-r0"
+# renovate: datasource=repology depName=alpine_3_12/gcc versioning=loose
+ENV GCC_VERSION="10.3.1_git20210409-r0"
+# renovate: datasource=repology depName=alpine_3_12/docker versioning=loose
+ENV DOCKER_VERSION="20.10.5-r2"
+# renovate: datasource=repology depName=alpine_3_12/python3 versioning=loose
+ENV PYTHON3_VERSION="3.9.4-r0"
+# renovate: datasource=repology depName=alpine_3_12/gnuplot versioning=loose
+ENV GUNPLOT_VERSION="5.4.1-r0"
+
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
 USER root
@@ -11,7 +23,7 @@ RUN echo "http://dl-2.alpinelinux.org/alpine/edge/community" >> /etc/apk/reposit
 RUN echo "http://dl-2.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 
 # install docker
-RUN apk -U --no-cache --allow-untrusted add gcc=10.3.1_git20210409-r0 docker=20.10.5-r2 python3=3.9.4-r0 gnuplot=5.4.1-r0
+RUN apk -U --no-cache --allow-untrusted add gcc=${GCC_VERSION} docker=${DOCKER_VERSION} python3=${PYTHON3_VERSION} gnuplot=${GUNPLOT_VERSION}
 
 # install kubectl
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/"$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)"/bin/linux/amd64/kubectl; chmod +x ./kubectl; mv ./kubectl /usr/local/bin/kubectl
@@ -21,7 +33,7 @@ COPY init/executors.groovy /usr/share/jenkins/ref/init.groovy.d/executors.groovy
 
 # change timezone
 RUN apk update && \
-    apk --no-cache add tzdata=2021a-r0 && \
+    apk --no-cache add tzdata=${TZDATA_VERSION} && \
     cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \
     apk del tzdata
 ENV JAVA_OPTS -Duser.timezone=Asia/Tokyo
diff --git a/kubernetes/monitoring/test/ab/Dockerfile b/kubernetes/monitoring/test/ab/Dockerfile
index 8cec613eb..a840f28d5 100644
--- a/kubernetes/monitoring/test/ab/Dockerfile
+++ b/kubernetes/monitoring/test/ab/Dockerfile
@@ -1,8 +1,13 @@
 FROM alpine:3.13.4
 ARG BUILD_DATE
 ARG VCS_REF
+
+# renovate: datasource=repology depName=alpine_3_12/apache2-utils versioning=loose
+ENV APACHE2-UTILS_VERSION="2.4.46-r3"
+
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
-RUN apk --no-cache add apache2-utils=2.4.46-r3
+
+RUN apk --no-cache add apache2-utils=${APACHE2-UTILS_VERSION}
 WORKDIR /home
 COPY sample.json /home/.
diff --git a/kubernetes/rabbitmq/Dockerfile b/kubernetes/rabbitmq/Dockerfile
index 5e6acf541..453d8af55 100644
--- a/kubernetes/rabbitmq/Dockerfile
+++ b/kubernetes/rabbitmq/Dockerfile
@@ -1,10 +1,14 @@
 FROM rabbitmq:3.8.14-management-alpine
 ARG BUILD_DATE
 ARG VCS_REF
+
+# renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
+ENV TZDATA_VERSION="2021a-r0"
+
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
 RUN apk update && \
-    apk --no-cache add tzdata=2021a-r0 && \
+    apk --no-cache add tzdata=${TZDATA_VERSION} && \
     cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \
     apk del tzdata
 COPY custom_definitions.json /etc/rabbitmq/