Updating Dockerfile to just have Teamcity

bladnor · Jul 27, 2015 · dec6a1f · dec6a1f
1 parent 6326c03
commit dec6a1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,17 @@
 FROM sjoerdmulder/java8
+
 # Get and install teamcity
 RUN curl -L https://download.jetbrains.com/teamcity/TeamCity-9.1.tar.gz | tar -xz -C /opt
 
 # Enable the correct Valve when running behind a proxy
 RUN sed -i -e "s/\.*<\/Host>.*$/<Valve className=\"org.apache.catalina.valves.RemoteIpValve\" protocolHeader=\"x-forwarded-proto\" \/><\/Host>/" /opt/TeamCity/conf/server.xml
 
-VOLUME /var/lib/teamcity
-# Expose the Teamcity port
-EXPOSE  8111
-
 ENV TEAMCITY_DATA_PATH /var/lib/teamcity
 
-ADD service /etc/service
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+VOLUME /var/lib/teamcity
+# Expose the Teamcity port
+EXPOSE  8111
diff --git a/service/teamcity/run → docker-entrypoint.sh b/service/teamcity/run → docker-entrypoint.sh
@@ -9,4 +9,4 @@ then
 fi
 
 echo "Starting teamcity..."
-/opt/TeamCity/bin/teamcity-server.sh run >> /var/log/teamcity.log
+exec /opt/TeamCity/bin/teamcity-server.sh run