Skip to content

Commit

Permalink
apk add in Dockerfile #395
Browse files Browse the repository at this point in the history
  • Loading branch information
yurake committed Apr 10, 2021
1 parent 54ac809 commit 2fba8c0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 4 deletions.
16 changes: 14 additions & 2 deletions kubernetes/monitoring/jenkins/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion kubernetes/monitoring/test/ab/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/.
6 changes: 5 additions & 1 deletion kubernetes/rabbitmq/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down

0 comments on commit 2fba8c0

Please sign in to comment.