From 5ee3c88166a1bf707d7dbcc5ce8300515bc201b0 Mon Sep 17 00:00:00 2001 From: Alexander Litvinenko Date: Sun, 3 Mar 2019 12:56:53 +0200 Subject: [PATCH 1/2] Override hardcoded TEAMCITY_VERSION during image building process with build args. Backward compatibility is preserved. --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa1d11c..acf0ef3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,11 @@ FROM logicify/tomcat:latest USER app WORKDIR /srv/apache-tomcat -ENV TEAMCITY_VERSION 2017.2.1 -ENV TEAMCITY_WEBAPP_PATH ROOT +ARG ARG_TEAMCITY_VERSION=2017.2.1 +ARG ARG_TEAMCITY_WEBAPP_PATH=ROOT + +ENV TEAMCITY_VERSION $ARG_TEAMCITY_VERSION +ENV TEAMCITY_WEBAPP_PATH $ARG_TEAMCITY_WEBAPP_PATH ENV CATALINA_OPTS \ -Xms768m \ From e65217fea641db6c9578aae23c94d92bf1828ba0 Mon Sep 17 00:00:00 2001 From: Alexander Litvinenko Date: Sun, 3 Mar 2019 12:57:38 +0200 Subject: [PATCH 2/2] Updated version to 2018.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index acf0ef3..5eea451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM logicify/tomcat:latest USER app WORKDIR /srv/apache-tomcat -ARG ARG_TEAMCITY_VERSION=2017.2.1 +ARG ARG_TEAMCITY_VERSION=2018.2.2 ARG ARG_TEAMCITY_WEBAPP_PATH=ROOT ENV TEAMCITY_VERSION $ARG_TEAMCITY_VERSION