diff --git a/dockerfiles/services/build_apps.sh b/dockerfiles/services/build_apps.sh index ec35f07..aa125ed 100644 --- a/dockerfiles/services/build_apps.sh +++ b/dockerfiles/services/build_apps.sh @@ -4,6 +4,8 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY (cd nextcloud && 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/sslproxy:2.1 +docker push dkregistry.xai-corp.net:5000/letsencrypt:latest diff --git a/dockerfiles/services/launch_apps.sh b/dockerfiles/services/launch_apps.sh index 3409b38..bdce756 100644 --- a/dockerfiles/services/launch_apps.sh +++ b/dockerfiles/services/launch_apps.sh @@ -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 sslproxy/docker-compose-prod.yml sslproxy + +docker stack deploy --with-registry-auth --prune -c letsencrypt/docker-compose-update.yml letsencrypt diff --git a/dockerfiles/services/letsencrypt/docker-compose-update.yml b/dockerfiles/services/letsencrypt/docker-compose-update.yml index b852a12..1dd129c 100644 --- a/dockerfiles/services/letsencrypt/docker-compose-update.yml +++ b/dockerfiles/services/letsencrypt/docker-compose-update.yml @@ -5,12 +5,12 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose-update.yml services_letsencrypt -version: '3' +version: '3.4' services: updates: -# image: "dkregistry.xai-corp.net:5000/letsencrypt:latest" - image: "blacklabelops/letsencrypt" + image: "dkregistry.xai-corp.net:5000/letsencrypt:latest" +# image: "blacklabelops/letsencrypt" ports: - 83:80 # - 443:443 @@ -21,7 +21,7 @@ services: LETSENCRYPT_HTTPS_ENABLED: "false" LETSENCRYPT_TESTCERT: "false" LETSENCRYPT_DEBUG: "true" - LETSENCRYPT_JOB_TIME: "0 */30 * * * 0" + LETSENCRYPT_JOB_TIME: "0 0 2 15 * *" LETSENCRYPT_DOMAIN1: xai-corp.net LETSENCRYPT_DOMAIN2: git.xai-corp.net LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net @@ -35,18 +35,24 @@ services: LETSENCRYPT_DOMAIN11: mail.xai-corp.net LETSENCRYPT_DOMAIN12: abcapi.xai-corp.net command: - - newcert + - renewal - --expand deploy: mode: replicated replicas: 1 restart_policy: - condition: none + condition: any + delay: "24h" + max_attempts: 7 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: - cpus: '0.5' - memory: 16M +# cpus: '1.5' + memory: 64M # logging: # driver: fluentd diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml index 03052bb..2042dd0 100644 --- a/dockerfiles/services/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml @@ -23,10 +23,10 @@ services: logging: driver: fluentd - tag: sslproxy options: fluentd-address: "logs.xai-corp.net:24224" fluentd-async-connect: 'true' + tag: sslproxy # logging: # driver: syslog