Browse Source

unify docker-compose

Create a unique docker-compose to manage all services. This allows for a
centralized endpoint to handle everything.

Remove all the dockerfiles for the handled active services.
Tom Jorquera 7 years ago
parent
commit
d52112b4b0
6 changed files with 93 additions and 76 deletions
  1. 1 1
      .gitignore
  2. 0 23
      cloud/docker-compose.yml
  3. 92 0
      docker-compose.yml
  4. 0 19
      git/docker-compose.yml
  5. 0 8
      homepage/docker-compose.yml
  6. 0 25
      pad/docker-compose.yml

+ 1 - 1
.gitignore

@@ -1 +1 @@
-*/.env
+**/.env

+ 0 - 23
cloud/docker-compose.yml

@@ -1,23 +0,0 @@
-version: '2'
-
-services:
-  db:
-    image: mariadb
-    restart: always
-    volumes:
-      - /srv/nextcloud/db:/var/lib/mysql
-    environment:
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-    env_file:
-      - .env
-
-  app:
-    image: nextcloud
-    links:
-      - db
-    volumes:
-      - /srv/nextcloud/app:/var/www/html
-    restart: always
-    ports:
-      - "127.0.0.1:9000:80"

+ 92 - 0
docker-compose.yml

@@ -0,0 +1,92 @@
+version: '2'
+
+services:
+
+  ### SERVICE: cloud
+
+  cloud_db:
+    image: mariadb
+    restart: always
+    environment:
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+    env_file:
+      - cloud/.env
+    networks:
+      - cloud
+    volumes:
+      - /srv/nextcloud/db:/var/lib/mysql
+
+  cloud_app:
+    image: nextcloud
+    restart: always
+    networks:
+      - cloud
+    ports:
+      - "127.0.0.1:9000:80"
+    volumes:
+      - /srv/nextcloud/app:/var/www/html
+
+  ### SERVICE: git
+
+  git_app:
+    image: gitlab/gitlab-ce
+    restart: always
+    environment:
+      - GITLAB_OMNIBUS_CONFIG |
+        external_url 'https://git.${DOMAIN}'
+    hostname: 'git.${DOMAIN}' # required by gitlab
+    networks:
+      - git
+    ports:
+      - "127.0.0.1:9002:80"
+      - "22:22"
+    volumes:
+      - /srv/gitlab/app/config:/etc/gitlab
+      - /srv/gitlab/app/logs:/var/log/gitlab
+      - /srv/gitlab/app/data:/var/opt/gitlab
+
+  ### SERVICE: homepage
+
+  homepage_app:
+    build: homepage
+    restart: always
+    networks:
+      - homepage
+    ports:
+      - "127.0.0.1:8999:80"
+
+  ### SERVICE: pad
+
+  pad_db:
+    image: mysql
+    restart: always
+    env_file:
+      - pad/.env
+    networks:
+      - pad
+    volumes:
+      - /srv/etherpad/db:/var/lib/mysql
+
+  pad_app:
+    build: pad
+    restart: always
+    env_file:
+      - pad/.env
+    environment:
+      - ETHERPAD_DB_HOST=pad_db
+      - ETHERPAD_TITLE=Bloc Note
+    networks:
+      - pad
+    ports:
+      - "127.0.0.1:9001:9001"
+    volumes:
+      - /srv/etherpad/app:/opt/etherpad-lite/var
+
+### NETWORKS
+
+networks:
+  cloud:
+  git:
+  homepage:
+  pad:

+ 0 - 19
git/docker-compose.yml

@@ -1,19 +0,0 @@
-version: '2'
-
-services:
-  app:
-    image: gitlab/gitlab-ce
-    restart: always
-    hostname: 'git.oxyta.net'
-    environment:
-      - GITLAB_OMNIBUS_CONFIG |
-        external_url 'https://git.oxyta.net'
-        gitlab_rails['gitlab_ssh_host'] = 'oxyta.net'
-    volumes:
-      - /srv/gitlab/app/config:/etc/gitlab
-      - /srv/gitlab/app/logs:/var/log/gitlab
-      - /srv/gitlab/app/data:/var/opt/gitlab
-    restart: always
-    ports:
-      - "127.0.0.1:9002:80"
-      - "22:22"

+ 0 - 8
homepage/docker-compose.yml

@@ -1,8 +0,0 @@
-version: '2'
-
-services:
-  app:
-    build: .
-    restart: always
-    ports:
-      - "127.0.0.1:8999:80"

+ 0 - 25
pad/docker-compose.yml

@@ -1,25 +0,0 @@
-version: '2'
-
-services:
-  db:
-    image: mysql
-    restart: always
-    volumes:
-      - /srv/etherpad/db:/var/lib/mysql
-    env_file:
-      - .env
-
-  app:
-    build: .
-    restart: always
-    links:
-      - db
-    volumes:
-      - /srv/etherpad/app:/opt/etherpad-lite/var
-    env_file:
-      - .env
-    environment:
-      - ETHERPAD_DB_HOST=db
-      - ETHERPAD_TITLE=Bloc Note
-    ports:
-      - "127.0.0.1:9001:9001"