add letsencrypt to the build scripts

This commit is contained in:
2018-02-23 06:40:49 -05:00
parent f85cd16b5d
commit 5fae85734b
4 changed files with 19 additions and 9 deletions

View File

@@ -4,6 +4,8 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
(cd nextcloud && docker-compose -f docker-compose.yml build) (cd nextcloud && docker-compose -f docker-compose.yml build)
(cd sslproxy && docker-compose -f docker-compose.yml build) (cd sslproxy && docker-compose -f docker-compose.yml build)
(cd letsencrypt && docker-compose -f docker-compose.yml build)
docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
docker push dkregistry.xai-corp.net:5000/sslproxy:2.1 docker push dkregistry.xai-corp.net:5000/sslproxy:2.1
docker push dkregistry.xai-corp.net:5000/letsencrypt:latest

View File

@@ -11,3 +11,5 @@ docker stack deploy --with-registry-auth --prune -c nextcloud/docker-compose-pro
docker stack deploy --with-registry-auth --prune -c ui/docker-compose.yml dkui docker stack deploy --with-registry-auth --prune -c ui/docker-compose.yml dkui
docker stack deploy --with-registry-auth --prune -c sslproxy/docker-compose-prod.yml sslproxy docker stack deploy --with-registry-auth --prune -c sslproxy/docker-compose-prod.yml sslproxy
docker stack deploy --with-registry-auth --prune -c letsencrypt/docker-compose-update.yml letsencrypt

View File

@@ -5,12 +5,12 @@
# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose-update.yml services_letsencrypt # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose-update.yml services_letsencrypt
version: '3' version: '3.4'
services: services:
updates: updates:
# image: "dkregistry.xai-corp.net:5000/letsencrypt:latest" image: "dkregistry.xai-corp.net:5000/letsencrypt:latest"
image: "blacklabelops/letsencrypt" # image: "blacklabelops/letsencrypt"
ports: ports:
- 83:80 - 83:80
# - 443:443 # - 443:443
@@ -21,7 +21,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 */30 * * * 0" LETSENCRYPT_JOB_TIME: "0 0 2 15 * *"
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
@@ -35,18 +35,24 @@ services:
LETSENCRYPT_DOMAIN11: mail.xai-corp.net LETSENCRYPT_DOMAIN11: mail.xai-corp.net
LETSENCRYPT_DOMAIN12: abcapi.xai-corp.net LETSENCRYPT_DOMAIN12: abcapi.xai-corp.net
command: command:
- newcert - renewal
- --expand - --expand
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
restart_policy: restart_policy:
condition: none condition: any
delay: "24h"
max_attempts: 7
update_config:
parallelism: 1
delay: 2s
order: start-first
resources: resources:
limits: limits:
cpus: '0.5' # cpus: '1.5'
memory: 16M memory: 64M
# logging: # logging:
# driver: fluentd # driver: fluentd

View File

@@ -23,10 +23,10 @@ services:
logging: logging:
driver: fluentd driver: fluentd
tag: sslproxy
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: sslproxy
# logging: # logging:
# driver: syslog # driver: syslog