From 7be4c9d866ead7801c89fe31c08dca6649f3466b Mon Sep 17 00:00:00 2001 From: Gabriel Akos Date: Thu, 23 Apr 2020 22:52:06 +0200 Subject: [PATCH 1/2] timezone support added --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b7c684..24e53fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ ENV JMETER_DOWNLOAD_URL https://archive.apache.org/dist/jmeter/binaries/apache- # Install extra packages # See https://github.com/gliderlabs/docker-alpine/issues/136#issuecomment-272703023 -# Change TimeZone TODO: TZ still is not set! ARG TZ="Europe/Amsterdam" +ENV TZ ${TZ} RUN apk update \ && apk upgrade \ && apk add ca-certificates \ @@ -26,6 +26,9 @@ RUN apk update \ && tar -xzf /tmp/dependencies/apache-jmeter-${JMETER_VERSION}.tgz -C /opt \ && rm -rf /tmp/dependencies +RUN cp /usr/share/zoneinfo/${TZ} /etc/localtime +RUN echo ${TZ} >/etc/timezone + # TODO: plugins (later) # && unzip -oq "/tmp/dependencies/JMeterPlugins-*.zip" -d $JMETER_HOME From 705500ad67cf65bd876ae36bb9ccf383925dd9a0 Mon Sep 17 00:00:00 2001 From: Gabriel Akos Date: Sat, 20 Jun 2020 16:08:25 +0200 Subject: [PATCH 2/2] requested changes done --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24e53fa..5e5eb9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV JMETER_DOWNLOAD_URL https://archive.apache.org/dist/jmeter/binaries/apache- # Install extra packages # See https://github.com/gliderlabs/docker-alpine/issues/136#issuecomment-272703023 ARG TZ="Europe/Amsterdam" -ENV TZ ${TZ} + RUN apk update \ && apk upgrade \ && apk add ca-certificates \ @@ -24,10 +24,9 @@ RUN apk update \ && curl -L --silent ${JMETER_DOWNLOAD_URL} > /tmp/dependencies/apache-jmeter-${JMETER_VERSION}.tgz \ && mkdir -p /opt \ && tar -xzf /tmp/dependencies/apache-jmeter-${JMETER_VERSION}.tgz -C /opt \ - && rm -rf /tmp/dependencies - -RUN cp /usr/share/zoneinfo/${TZ} /etc/localtime -RUN echo ${TZ} >/etc/timezone + && rm -rf /tmp/dependencies \ + && cp /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo ${TZ} >/etc/timezone # TODO: plugins (later) # && unzip -oq "/tmp/dependencies/JMeterPlugins-*.zip" -d $JMETER_HOME