xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

switch sslproxy and fluentd to global service so each host runs one container.

Browse Source 
build own image for letsencrypt, and tweek update job runtime.
This commit is contained in:
richard
2017-12-23 22:03:51 -05:00
parent 785db4ec18
commit d6806a673e
11 changed files with 65 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dkswarm.xai-corp.net.yml
View File

@@ -11,13 +11,13 @@
- swarm: - swarm:
managers: managers:
- dkhost01 - dkhost01
- dkhost05 - dkhost03
- home - home
workers: [] workers: []
removed: removed:
- dkhost04 - dkhost04
- dkhost02 - dkhost02
- dkhost03 - dkhost05
history: 1 history: 1

6
dockerfiles/services/dkregistry/docker-compose.yml
View File

@@ -31,15 +31,15 @@ services:
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 2
restart_policy: restart_policy:
condition: any condition: any
delay: "1s" delay: "1s"
max_attempts: 1 max_attempts: 1
resources: resources:
limits: limits:
cpus: '0.1' cpus: '0.2'
memory: 16M memory: 64M
logging: logging:
driver: fluentd driver: fluentd

3
dockerfiles/services/letsencrypt/Dockerfile Normal file
View File

@@ -0,0 +1,3 @@
FROM blacklabelops/letsencrypt:latest
MAINTAINER Richard Morgan <r_morgan@sympatico.ca>

16
dockerfiles/services/letsencrypt/docker-compose-update.yml
View File

@@ -9,7 +9,7 @@ version: '3'
services: services:
updates: updates:
image: "blacklabelops/letsencrypt" image: "dkregistry.xai-corp.net:5000/letsencrypt:latest"
ports: ports:
- 83:80 - 83:80
# - 443:443 # - 443:443
@@ -20,7 +20,7 @@ services:
LETSENCRYPT_HTTPS_ENABLED: "false" LETSENCRYPT_HTTPS_ENABLED: "false"
LETSENCRYPT_TESTCERT: "false" LETSENCRYPT_TESTCERT: "false"
LETSENCRYPT_DEBUG: "true" LETSENCRYPT_DEBUG: "true"
LETSENCRYPT_JOB_TIME: "0 0 1 */2 * *" LETSENCRYPT_JOB_TIME: "0 1 */12 * * 0"
LETSENCRYPT_DOMAIN1: xai-corp.net LETSENCRYPT_DOMAIN1: xai-corp.net
LETSENCRYPT_DOMAIN2: git.xai-corp.net LETSENCRYPT_DOMAIN2: git.xai-corp.net
LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net
@@ -43,9 +43,9 @@ services:
cpus: '0.5' cpus: '0.5'
memory: 16M memory: 16M
logging: # logging:
driver: fluentd # driver: fluentd
options: # options:
fluentd-address: "logs.xai-corp.net:24224" # fluentd-address: "logs.xai-corp.net:24224"
fluentd-async-connect: 'true' # fluentd-async-connect: 'true'
tag: letsencrypt-update # tag: letsencrypt-update

104
dockerfiles/services/letsencrypt/docker-compose.yml
View File

@@ -5,80 +5,38 @@
# DOCKER_HOST=dkhost01:2376 docker-compose up updates # DOCKER_HOST=dkhost01:2376 docker-compose up updates
# docker login dkregistry.xai-corp.net:5000 # docker login dkregistry.xai-corp.net:5000
# docker-compose build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest # docker-compose build && docker push dkregistry.xai-corp.net:5000/letsencrypt:latest
# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services_letsencrypt # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-update.yml services_letsencrypt
# DOCKER_HOST=dkhost:2376 docker stack ps services
version: '3' version: '3'
services: services:
install: builder:
image: "blacklabelops/letsencrypt" build:
container_name: letsencrypt_staging_install context: ""
ports: dockerfile: Dockerfile
- 80:80 image: "dkregistry.xai-corp.net:5000/letsencrypt:latest"
# - 443:443 # ports:
volumes: # - 80:80
- /opt/shared/letsencrypt-2-staging:/etc/letsencrypt ## - 443:443
environment: # volumes:
LETSENCRYPT_HTTPS_ENABLED: "false" # - /opt/shared/letsencrypt-2-staging:/etc/letsencrypt
LETSENCRYPT_EMAIL: r_morgan@sympatico.ca # environment:
LETSENCRYPT_DOMAIN1: xai-corp.net # LETSENCRYPT_HTTPS_ENABLED: "false"
LETSENCRYPT_DOMAIN2: git.xai-corp.net # LETSENCRYPT_EMAIL: r_morgan@sympatico.ca
LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net # LETSENCRYPT_DOMAIN1: xai-corp.net
LETSENCRYPT_DOMAIN4: dkui.xai-corp.net # LETSENCRYPT_DOMAIN2: git.xai-corp.net
LETSENCRYPT_DOMAIN5: dkregistry.xai-corp.net # LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net
LETSENCRYPT_DOMAIN6: fs.xai-corp.net # LETSENCRYPT_DOMAIN4: dkui.xai-corp.net
LETSENCRYPT_DOMAIN7: jenkins.xai-corp.net # LETSENCRYPT_DOMAIN5: dkregistry.xai-corp.net
LETSENCRYPT_DOMAIN8: sql.xai-corp.net # LETSENCRYPT_DOMAIN6: fs.xai-corp.net
LETSENCRYPT_DOMAIN9: office.xai-corp.net # LETSENCRYPT_DOMAIN7: jenkins.xai-corp.net
LETSENCRYPT_DOMAIN9: www.xai-corp.net # LETSENCRYPT_DOMAIN8: sql.xai-corp.net
command: # LETSENCRYPT_DOMAIN9: office.xai-corp.net
- install # LETSENCRYPT_DOMAIN9: www.xai-corp.net
- --staging # command:
- --expand # - install
# - --staging
deploy: # - --expand
mode: replicated
replicas: 1
restart_policy:
condition: none
resources:
limits:
cpus: '0.1'
memory: 256M
updates:
image: "blacklabelops/letsencrypt"
container_name: letsencrypt_staging_updates
ports:
- 80:80
# - 443:443
volumes:
- /opt/shared/letsencrypt-2-staging:/etc/letsencrypt
environment:
LETSENCRYPT_HTTPS_ENABLED: "false"
LETSENCRYPT_EMAIL: r_morgan@sympatico.ca
LETSENCRYPT_DOMAIN1: xai-corp.net
LETSENCRYPT_DOMAIN2: git.xai-corp.net
LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net
LETSENCRYPT_DOMAIN4: dkui.xai-corp.net
LETSENCRYPT_DOMAIN5: dkregistry.xai-corp.net
LETSENCRYPT_DOMAIN6: fs.xai-corp.net
LETSENCRYPT_DOMAIN7: jenkins.xai-corp.net
LETSENCRYPT_DOMAIN8: sql.xai-corp.net
LETSENCRYPT_DOMAIN9: office.xai-corp.net
LETSENCRYPT_DOMAIN9: www.xai-corp.net
command:
- install
- --staging
- --expand
deploy:
mode: replicated
replicas: 1
restart_policy:
condition: none
resources:
limits:
cpus: '0.1'
memory: 256M

2
dockerfiles/services/nextcloud/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM nextcloud:12 FROM nextcloud:latest
RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*

12
dockerfiles/services/nextcloud/docker-compose.yml
View File

@@ -43,9 +43,9 @@ services:
#TODO: #TODO:
# cron: # cron:
http: # http:
image: "dkregistry.xai-corp.net:5000/sslproxy:2.0" # image: "dkregistry.xai-corp.net:5000/sslproxy:2.0"
volumes: # volumes:
- ./letsencrypt:/etc/letsencrypt:ro # - ./letsencrypt:/etc/letsencrypt:ro
ports: # ports:
- "443:443" # - "443:443"

3
dockerfiles/services/services/fluentd/docker-compose.yml
View File

@@ -24,9 +24,8 @@ services:
deploy: deploy:
mode: replicated mode: global
replicas: 1
restart_policy: restart_policy:
condition: any condition: any
delay: "1s" delay: "1s"

7
dockerfiles/services/sslproxy/docker-compose-prod.yml
View File

@@ -2,8 +2,8 @@
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d # DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# docker login dkregistry.xai-corp.net:5000 # docker login dkregistry.xai-corp.net:5000
# docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.0 # docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.0
# DOCKER_HOST=dkhost01:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml sslproxy # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml sslproxy
# DOCKER_HOST=dkhost01:2376 docker stack ps sslproxy # DOCKER_HOST=dkhost:2376 docker stack ps sslproxy
version: '3' version: '3'
services: services:
@@ -34,8 +34,7 @@ services:
# tag: sslproxy # tag: sslproxy
deploy: deploy:
mode: replicated mode: global
replicas: 3
restart_policy: restart_policy:
condition: any condition: any
delay: 5s delay: 5s

3
dockerfiles/tasks/dev-php7.0/Dockerfile.yml Normal file
View File

@@ -0,0 +1,3 @@
# docker login dkregistry.xai-corp.net:5000
# docker-compose build
# docker push dkregistry.xai-corp.net:5000/xaicorp/php7.0-dev:latest

8
inventory.conf
View File

@@ -5,18 +5,18 @@ home ansible_ssh_host=192.168.2.11
home02 ansible_ssh_host=192.168.2.22 home02 ansible_ssh_host=192.168.2.22
dkhost01 ansible_ssh_host=192.168.2.41 dkhost01 ansible_ssh_host=192.168.2.41
#dkhost02 ansible_ssh_host=192.168.2.43 #dkhost02 ansible_ssh_host=192.168.2.43
#dkhost03 ansible_ssh_host=192.168.2.53 dkhost03 ansible_ssh_host=192.168.2.53
#dkhost04 ansible_ssh_host=192.168.2.54 #dkhost04 ansible_ssh_host=192.168.2.54
dkhost05 ansible_ssh_host=192.168.2.55 #dkhost05 ansible_ssh_host=192.168.2.55
#logs ansible_ssh_host=192.168.2.42 #logs ansible_ssh_host=192.168.2.42
cubox-i ansible_ssh_host=192.168.2.12 cubox-i ansible_ssh_host=192.168.2.12
[dkhost] [dkhost]
dkhost01 ansible_ssh_host=192.168.2.41 dkhost01 ansible_ssh_host=192.168.2.41
#dkhost02 ansible_ssh_host=192.168.2.43 #dkhost02 ansible_ssh_host=192.168.2.43
#dkhost03 ansible_ssh_host=192.168.2.53 dkhost03 ansible_ssh_host=192.168.2.53
#dkhost04 ansible_ssh_host=192.168.2.54 #dkhost04 ansible_ssh_host=192.168.2.54
dkhost05 ansible_ssh_host=192.168.2.55 #dkhost05 ansible_ssh_host=192.168.2.55
home ansible_ssh_host=192.168.2.11 home ansible_ssh_host=192.168.2.11
[ns] [ns]