diff --git a/dockerfiles/services/cron/Dockerfile b/dockerfiles/services/cron/Dockerfile new file mode 100644 index 0000000..fa9056f --- /dev/null +++ b/dockerfiles/services/cron/Dockerfile @@ -0,0 +1,10 @@ +FROM alpine:latest +MAINTAINER Richard Morgan + + +COPY ./periodic /etc/periodic/15min + +# Run the command on container startup +#CMD cron && tail -f /var/log/cron.log +#CMD tail -f /var/log/cron.log +CMD crond -l 2 -f diff --git a/dockerfiles/services/cron/docker-compose.yml b/dockerfiles/services/cron/docker-compose.yml new file mode 100644 index 0000000..637b8e0 --- /dev/null +++ b/dockerfiles/services/cron/docker-compose.yml @@ -0,0 +1,38 @@ +--- +# docker-compose file for cron +# docker login dkregistry.xai-corp.net:5000 +# docker-compose build && docker push dkregistry.xai-corp.net:5000/cron:latest +# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services + +version: '3' +services: + + cron: + image: "dkregistry.xai-corp.net:5000/cron:latest" + build: + context: . + dockerfile: Dockerfile + + deploy: + mode: replicated + + replicas: 1 + restart_policy: + condition: any + delay: "1s" + max_attempts: 3 + resources: + limits: + cpus: '0.5' + memory: 256M + + logging: + driver: syslog + options: + syslog-address: "tcp+tls://logs6.papertrailapp.com:38577" + tag: "{{.Name}}/{{.ID}}" + +#networks: +# default: +# external: +# name: prod-private diff --git a/dockerfiles/services/cron/periodic/15min/helloworld b/dockerfiles/services/cron/periodic/15min/helloworld new file mode 100644 index 0000000..c70bff7 --- /dev/null +++ b/dockerfiles/services/cron/periodic/15min/helloworld @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "Hello world" >> /var/log/cron.log 2>&1 diff --git a/dockerfiles/sslproxy/cetbot/Dockerfile b/dockerfiles/sslproxy/cetbot/Dockerfile new file mode 100644 index 0000000..e5258f9 --- /dev/null +++ b/dockerfiles/sslproxy/cetbot/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:alpine + +COPY ./nginx.conf /etc/nginx/nginx.conf +COPY ./hosts /etc/nginx/conf.d/ diff --git a/dockerfiles/sslproxy/docker-compose-prod.yml b/dockerfiles/sslproxy/docker-compose-prod.yml index 261587b..f1f9640 100644 --- a/dockerfiles/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/sslproxy/docker-compose-prod.yml @@ -8,7 +8,7 @@ version: '3' services: app: - image: "dkregistry.xai-corp.net:5000/sslproxy:latest" + image: "dkregistry.xai-corp.net:5000/sslproxy:2.0" volumes: - /etc/letsencrypt:/etc/letsencrypt:ro ports: @@ -22,7 +22,7 @@ services: deploy: mode: replicated - replicas: 1 + replicas: 2 restart_policy: condition: any delay: 5s diff --git a/dockerfiles/sslproxy/docker-compose.yml b/dockerfiles/sslproxy/docker-compose.yml index 1848580..38442dd 100644 --- a/dockerfiles/sslproxy/docker-compose.yml +++ b/dockerfiles/sslproxy/docker-compose.yml @@ -1,15 +1,15 @@ --- # DOCKER_HOST=192.168.2.41:2376 docker-compose up -d # docker login dkregistry.xai-corp.net:5000 -# docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:latest -# DOCKER_HOST=dkhost01:2376 docker stack deploy --with-registry-auth -c docker-compose.yml sslproxy -# DOCKER_HOST=dkhost01:2376 docker stack ps sslproxy +# docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.0 +# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose.yml sslproxy +# DOCKER_HOST=dkhost:2376 docker stack ps sslproxy version: '3' services: + app: -# restart: always - image: "dkregistry.xai-corp.net:5000/sslproxy:latest" + image: "dkregistry.xai-corp.net:5000/sslproxy:2.0" build: context: . dockerfile: Dockerfile @@ -18,3 +18,8 @@ services: - /etc/letsencrypt:/etc/letsencrypt:ro ports: - "443:443" + +# certbot: +# image: "dkregistry.xai-corp.net:5000/sslproxy:latest" +# build: +# context: certbot diff --git a/dockerfiles/sslproxy/hosts/xaibox.xai-corp.net.conf b/dockerfiles/sslproxy/hosts/xaibox.xai-corp.net.conf index 9b01e76..d957a1b 100644 --- a/dockerfiles/sslproxy/hosts/xaibox.xai-corp.net.conf +++ b/dockerfiles/sslproxy/hosts/xaibox.xai-corp.net.conf @@ -5,6 +5,8 @@ server { ssl_certificate /etc/letsencrypt/live/xaibox.xai-corp.net/cert.pem; ssl_certificate_key /etc/letsencrypt/live/xaibox.xai-corp.net/privkey.pem; + client_max_body_size 200m; + #Strict-Transport-Security: max-age=15768000 add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;