the-nine-worlds/loki
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change container names

Browse Source
This commit is contained in:
Wojciech Kozlowski 2018-01-25 00:30:19 +00:00
parent d94e56b755
commit 0d82b97c4d
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker-compose.yml
View File

@ -19,7 +19,7 @@ services:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
html: html:
container_name: docker_html container_name: html
image: nginx image: nginx
volumes: volumes:
- ./html/html-wojciechkozlowski.eu/:/usr/share/nginx/html/ - ./html/html-wojciechkozlowski.eu/:/usr/share/nginx/html/
@ -30,7 +30,7 @@ services:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
wiki: wiki:
container_name: docker_wiki container_name: wiki
build: dokuwiki build: dokuwiki
image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/wiki image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/wiki
volumes: volumes:
@ -42,7 +42,7 @@ services:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
nextcloud-db: nextcloud-db:
container_name: nextcloud_db container_name: nextcloud-db
image: mariadb image: mariadb
volumes: volumes:
- vol_nextcloud_db:/var/lib/mysql - vol_nextcloud_db:/var/lib/mysql
@ -54,7 +54,7 @@ services:
restart: always restart: always
nextcloud-app: nextcloud-app:
container_name: nextcloud_app container_name: nextcloud-app
image: nextcloud:fpm image: nextcloud:fpm
links: links:
- nextcloud-db - nextcloud-db
@ -63,7 +63,7 @@ services:
restart: always restart: always
nextcloud-cron: nextcloud-cron:
container_name: nextcloud_cron container_name: nextcloud-cron
build: nextcloud/cron build: nextcloud/cron
image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/nextcloud-cron image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/nextcloud-cron
volumes_from: volumes_from:
@ -71,7 +71,7 @@ services:
restart: always restart: always
nextcloud: nextcloud:
container_name: docker_cloud container_name: nextcloud
image: nginx image: nginx
links: links:
- nextcloud-app - nextcloud-app
@ -86,7 +86,7 @@ services:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
gitlab: gitlab:
container_name: docker_gitlab container_name: gitlab
image: gitlab/gitlab-ce image: gitlab/gitlab-ce
environment: environment:
GITLAB_OMNIBUS_CONFIG: | GITLAB_OMNIBUS_CONFIG: |
@ -147,7 +147,7 @@ services:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
runner: runner:
container_name: gitlab_runner container_name: runner-main
build: runner build: runner
image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/runner image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/runner
volumes: volumes:

1
loki-server.service
View File

@ -5,6 +5,7 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/root/Dockerfiles WorkingDirectory=/root/Dockerfiles
Environment="COMPOSE_HTTP_TIMEOUT=300"
ExecStart=/usr/bin/docker-compose up ExecStart=/usr/bin/docker-compose up
ExecStop=/usr/bin/docker-compose down ExecStop=/usr/bin/docker-compose down
Restart=always Restart=always

2
nextcloud/nginx.conf
View File

@ -6,7 +6,7 @@ events {
http { http {
upstream backend { upstream backend {
server nextcloud_app:9000; server nextcloud-app:9000;
} }
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;

2
proxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf
View File

@ -22,7 +22,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass http://docker_cloud; proxy_pass http://nextcloud;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

2
proxy/nginx-conf.d/gitlab.wojciechkozlowski.eu.conf
View File

@ -20,7 +20,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass http://docker_gitlab; proxy_pass http://gitlab;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

2
proxy/nginx-conf.d/wiki.wojciechkozlowski.eu.conf
View File

@ -20,7 +20,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass http://docker_wiki; proxy_pass http://wiki;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

2
proxy/nginx-conf.d/wojciechkozlowski.eu.conf
View File

@ -20,7 +20,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass http://docker_html; proxy_pass http://html;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

2
update.sh
View File

@ -25,7 +25,7 @@ make -C $DIRNAME pull-all
echo -e "${CYAN}[${SCRIPT}] Restart the containers${NC}" echo -e "${CYAN}[${SCRIPT}] Restart the containers${NC}"
COMPOSE_HTTP_TIMEOUT=300 service loki-server restart service loki-server restart
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Wait for containers to start. # Wait for containers to start.