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

Don't build containers which just mount files from repo

Browse Source
This commit is contained in:
Wojciech Kozlowski 2018-01-24 19:27:06 +00:00
parent 5bb00727f9
commit 448d8a18b4
2 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile
View File

@ -10,24 +10,6 @@ DOCKER_REGISTRY = gitlab.wojciechkozlowski.eu:8443/wojtek/loki
default: all
# -----------------------------------------------------------------------------
# html
# -----------------------------------------------------------------------------
html-clean:
docker rmi $(DOCKER_REGISTRY)/html || /bin/true
html-build:
docker-compose build html
html-push:
docker-compose push html
html-pull:
docker-compose pull html
html: html-clean html-build html-push
# -----------------------------------------------------------------------------
# wiki
# -----------------------------------------------------------------------------
@ -64,24 +46,6 @@ nextcloud-cron-pull:
nextcloud-cron: nextcloud-cron-clean nextcloud-cron-build nextcloud-cron-push
# -----------------------------------------------------------------------------
# gitlab
# -----------------------------------------------------------------------------
gitlab-clean:
docker rmi $(DOCKER_REGISTRY)/gitlab || /bin/true
gitlab-build:
docker-compose build gitlab
gitlab-push:
docker-compose push gitlab
gitlab-pull:
docker-compose pull gitlab
gitlab: gitlab-clean gitlab-build gitlab-push
# -----------------------------------------------------------------------------
# proxy
# -----------------------------------------------------------------------------
@ -143,7 +107,7 @@ runner: runner-clean runner-build runner-push
clean-all:
docker rmi $(shell docker images -q)
clean-builds: html-clean wiki-clean nextcloud-cron-clean gitlab-clean proxy-clean certbot-clean runner-clean
clean-builds: wiki-clean nextcloud-cron-clean proxy-clean certbot-clean runner-clean
build-all:
docker-compose build
@ -154,7 +118,7 @@ push-all:
pull-all:
docker-compose pull
pull-builds: html-pull wiki-pull nextcloud-cron-pull gitlab-pull proxy-pull certbot-pull runner-pull
pull-builds: wiki-pull nextcloud-cron-pull proxy-pull certbot-pull runner-pull
# -----------------------------------------------------------------------------
# Clean - build - push

9
docker-compose.yml
View File

@ -20,8 +20,9 @@ services:
html:
container_name: docker_html
build: html
image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/html
image: nginx
volumes:
- ./html/html-wojciechkozlowski.eu/:/usr/share/nginx/html/
restart: always
# ---------------------------------------------------------------------------
@ -86,8 +87,7 @@ services:
gitlab:
container_name: docker_gitlab
build: gitlab
image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/gitlab
image: gitlab/gitlab-ce
environment:
GITLAB_OMNIBUS_CONFIG: |
external_url 'http://gitlab.wojciechkozlowski.eu'
@ -103,6 +103,7 @@ services:
- vol_gitlab_logs:/var/log/gitlab
- vol_gitlab_data:/var/opt/gitlab
- vol_letsencrypt:/etc/letsencrypt
- ./gitlab/ssh_config:/etc/ssh/ssh_config
restart: always
# ---------------------------------------------------------------------------