Improved sourcecode docker container

webdevops · Oct 18, 2015 · bdc0130 · bdc0130
1 parent a8f5c7c
commit bdc0130
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/docker/sourcecode/Dockerfile → Dockerfile-Source b/docker/sourcecode/Dockerfile → Dockerfile-Source
@@ -11,7 +11,7 @@
 
 FROM ubuntu:14.04
 
-ADD entrypoint.sh   /entrypoint.sh
+ADD bin/entrypoint.sh   /entrypoint.sh
 
 RUN mkdir -p /docker/code/
 RUN chmod -R 777 /docker/code/

diff --git a/Makefile b/Makefile
@@ -37,8 +37,6 @@ rebuild:
 #############################
 
 cloud-build:
-	mkdir -p docker/sourcecode/code
-	rsync -a code/ docker/sourcecode/code/
 	docker-compose --file docker-compose-cloud.yml build
 	docker-compose --file docker-compose-cloud.yml build --no-cache sourcecode
 	docker-compose --file docker-compose-cloud.yml stop

diff --git a/docker/sourcecode/entrypoint.sh → bin/entrypoint.sh b/docker/sourcecode/entrypoint.sh → bin/entrypoint.sh
diff --git a/docker-compose-cloud.yml b/docker-compose-cloud.yml
@@ -136,7 +136,8 @@ mysql:
 # sourcecode
 #######################################
 sourcecode:
-  build: docker/sourcecode/
+  build: .
+  dockerfile: Dockerfile-Source
   volumes:
     - /docker/code/
   env_file:

diff --git a/docker/sourcecode/code/.gitkeep b/docker/sourcecode/code/.gitkeep