Cleanup

webdevops · Oct 16, 2015 · 2b86f97 · 2b86f97
1 parent 910e040
commit 2b86f97
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,17 +1,15 @@
 main:
-  build: docker/samson
+  build: samson
   links:
     - mysql
   ports:
     - 9080:9080
-  volumes:
-    - ./deployment:/opt/deployment/
   env_file:
     - docker-env.yml
 
 mysql:
-  build: docker/mysql
+  build: mysql
   ports:
-    - 13306:3306
+    - 23306:3306
   env_file:
-    - docker-env.yml
+    - docker-env.yml
diff --git a/docker/mysql/Dockerfile → mysql/Dockerfile b/docker/mysql/Dockerfile → mysql/Dockerfile
diff --git a/docker/mysql/conf/mysql-docker.cnf → mysql/conf/mysql-docker.cnf b/docker/mysql/conf/mysql-docker.cnf → mysql/conf/mysql-docker.cnf
diff --git a/docker/samson/Dockerfile → samson/Dockerfile b/docker/samson/Dockerfile → samson/Dockerfile
@@ -5,15 +5,18 @@ ENV PYTHONPATH       /opt/ansible/lib
 ENV ANSIBLE_LIBRARY  /opt/ansible/library
 
 # Setup samson
-ADD config/database.yml /app/config/database.yml
-ADD config/samson.conf  /app/.env
+ADD conf/database.yml /app/config/database.yml
+ADD conf/samson.conf  /app/.env
 
 # Install additional deployment packages
 COPY bin/install.sh  /install.sh
 RUN  bash /install.sh
 
+# Deploy deployment scripts
+COPY deployment/  /opt/deployment/
+
 # Deploy ssh configuration/keys
-COPY config/ssh/ /root/.ssh/
+COPY conf/ssh/    /root/.ssh/
 
 # Run
 COPY bin/entrypoint.sh       /entrypoint.sh

diff --git a/docker/samson/bin/entrypoint.sh → samson/bin/entrypoint.sh b/docker/samson/bin/entrypoint.sh → samson/bin/entrypoint.sh
diff --git a/docker/samson/bin/install.sh → samson/bin/install.sh b/docker/samson/bin/install.sh → samson/bin/install.sh
diff --git a/docker/samson/config/database.yml → samson/conf/database.yml b/docker/samson/config/database.yml → samson/conf/database.yml
diff --git a/docker/samson/config/samson.conf → samson/conf/samson.conf b/docker/samson/config/samson.conf → samson/conf/samson.conf
diff --git a/docker/samson/config/ssh/.gitkeep → samson/conf/ssh/.gitkeep b/docker/samson/config/ssh/.gitkeep → samson/conf/ssh/.gitkeep
diff --git a/docker/samson/config/ssh/config → samson/conf/ssh/config b/docker/samson/config/ssh/config → samson/conf/ssh/config
diff --git a/deployment/deploy → samson/deployment/deploy b/deployment/deploy → samson/deployment/deploy
diff --git a/deployment/deploy.yml → samson/deployment/deploy.yml b/deployment/deploy.yml → samson/deployment/deploy.yml
diff --git a/deployment/inventory/vagrant → samson/deployment/inventory/vagrant b/deployment/inventory/vagrant → samson/deployment/inventory/vagrant
diff --git a/deployment/rsync-excludes → samson/deployment/rsync-excludes b/deployment/rsync-excludes → samson/deployment/rsync-excludes
diff --git a/deployment/tasks/build.yml → samson/deployment/tasks/build.yml b/deployment/tasks/build.yml → samson/deployment/tasks/build.yml