mifird

3miliomc · Oct 22, 2016 · 99da423 · 99da423
1 parent b9a427e
commit 99da423
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/dockerfiles/agente-dotnet-v101/Dockerfile b/dockerfiles/agente-dotnet-v101/Dockerfile
@@ -1,5 +1,5 @@
 FROM java:8-jdk
-#FROM docker:1.12.1
+#FROM docker:1.12.2
 #FROM debian:jessie
 
 MAINTAINER Emilio Montes <[email protected]>
@@ -58,6 +58,12 @@ RUN useradd jenkins --shell /bin/bash -d ${JENKINS_HOME} --create-home \
 RUN wget -q https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/${SWARM_CLIENT_VERSION}/swarm-client-${SWARM_CLIENT_VERSION}-jar-with-dependencies.jar -P /home/jenkins/
 RUN pip install docker-compose
 
+#COPY docker-entrypoint.sh /usr/local/bin/
+
+#ENTRYPOINT ["docker-entrypoint.sh"]
+
+#CMD sh
+
 COPY run2.sh /run2.sh
 RUN chmod +x /run2.sh
 

diff --git a/dockerfiles/agente-dotnet-v101/jenkins-slave.sh b/dockerfiles/agente-dotnet-v101/jenkins-slave.sh
@@ -0,0 +1 @@
+