Fix Docker contexts for runtimes

2018-04-30 23:23:54 +02:00 · 2018-04-30 23:23:54 +02:00 · 375d345325
commit 375d345325
parent 551e9801b2
9 changed files with 7 additions and 7 deletions
--- a/basic-runtimes.sh
+++ b/basic-runtimes.sh
@ -3,9 +3,9 @@
 SOURCE_DIR=$(realpath $(dirname "${0}"))/basic-runtimes

 # Build Docker images
-docker build -t java ${SOURCE_DIR}/java.Dockerfile
-docker build -t php ${SOURCE_DIR}/php.Dockerfile
-docker build -t python2 ${SOURCE_DIR}/python2.Dockerfile
-docker build -t python3 ${SOURCE_DIR}/python3.Dockerfile
-docker build -t ruby ${SOURCE_DIR}/ruby.Dockerfile
-docker build -t tomcat ${SOURCE_DIR}/tomcat.Dockerfile
+docker build -t java ${SOURCE_DIR}/java
+docker build -t php ${SOURCE_DIR}/php
+docker build -t python2 ${SOURCE_DIR}/python2
+docker build -t python3 ${SOURCE_DIR}/python3
+docker build -t ruby ${SOURCE_DIR}/ruby
+docker build -t tomcat ${SOURCE_DIR}/tomcat
--- a/basic-runtimes/java/Dockerfile
+++ b/basic-runtimes/java/Dockerfile
--- a/basic-runtimes/php/Dockerfile
+++ b/basic-runtimes/php/Dockerfile
--- a/basic-runtimes/python2/Dockerfile
+++ b/basic-runtimes/python2/Dockerfile
--- a/basic-runtimes/python3/Dockerfile
+++ b/basic-runtimes/python3/Dockerfile
--- a/basic-runtimes/ruby/Dockerfile
+++ b/basic-runtimes/ruby/Dockerfile
--- a/basic-runtimes/tomcat/Dockerfile
+++ b/basic-runtimes/tomcat/Dockerfile
@ -12,4 +12,4 @@ RUN \
 && rm -rf /srv/tomcat/webapps/ROOT /srv/tomcat/webapps/docs /srv/tomcat/webapps/examples /srv/tomcat/webapps/host-manager /srv/tomcat/webapps/manager \
 && rm -f /tmp/apache-tomcat-8.tgz

-COPY tomcat.docker/ /
+COPY docker/ /
--- a/basic-runtimes/tomcat/docker/srv/tomcat/bin/setenv.sh
+++ b/basic-runtimes/tomcat/docker/srv/tomcat/bin/setenv.sh
--- a/basic-runtimes/tomcat/docker/srv/tomcat/conf/logging.properties
+++ b/basic-runtimes/tomcat/docker/srv/tomcat/conf/logging.properties