From 2c4eed7d5b924ddaf94bb9a835f5b293052fced1 Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 7 Apr 2018 13:47:32 -0400 Subject: [PATCH] setup cron for nextcloud --- .../services/services/build_services.sh | 2 ++ dockerfiles/services/services/cron/Dockerfile | 12 +++------- .../services/services/cron/docker-compose.yml | 22 ++++++++++++++----- .../services/cron/periodic/15min/helloworld | 3 --- .../services/cron/periodic/15min/nextcloud | 3 +++ .../cron/periodic/1min/abcapi-import.sh | 20 ----------------- .../services/cron/periodic/1min/hellominute | 3 --- .../services/cron/periodic/1min/helloworld | 3 +++ .../services/services/launch_services.sh | 1 + 9 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 dockerfiles/services/services/cron/periodic/15min/helloworld create mode 100644 dockerfiles/services/services/cron/periodic/15min/nextcloud delete mode 100644 dockerfiles/services/services/cron/periodic/1min/abcapi-import.sh delete mode 100644 dockerfiles/services/services/cron/periodic/1min/hellominute create mode 100644 dockerfiles/services/services/cron/periodic/1min/helloworld diff --git a/dockerfiles/services/services/build_services.sh b/dockerfiles/services/services/build_services.sh index dc1cbbc..5a3273e 100644 --- a/dockerfiles/services/services/build_services.sh +++ b/dockerfiles/services/services/build_services.sh @@ -3,5 +3,7 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY (cd fluentd && docker-compose -f docker-compose.yml build) +(cd cron && docker-compose -f docker-compose.yml -f ../network.yml build) docker push dkregistry.xai-corp.net:5000/fluentd:latest +docker push dkregistry.xai-corp.net:5000/xaicorp/cron:latest diff --git a/dockerfiles/services/services/cron/Dockerfile b/dockerfiles/services/services/cron/Dockerfile index f3f3556..f306392 100644 --- a/dockerfiles/services/services/cron/Dockerfile +++ b/dockerfiles/services/services/cron/Dockerfile @@ -6,23 +6,17 @@ USER root ENV DOCKER_VERSION=17.09.0-ce ENV DOCKER_MACHINE_VERSION=v0.13.0 -COPY ./periodic /etc/periodic -COPY ./crontab /var/spool/cron/crontabs/root -RUN chmod +x -R /etc/periodic/ - RUN apk add --update \ gpgme \ curl \ py-pip && \ pip install --upgrade pip && \ - curl -L -o /tmp/docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && tar -xz -C /tmp -f /tmp/docker-${DOCKER_VERSION}.tgz && mv /tmp/docker/docker /usr/local/bin && \ - chmod +x /usr/local/bin/docker && \ - pip install docker-compose docker-cloud && \ - curl -L https://github.com/docker/machine/releases/download/${DOCKER_MACHINE_VERSION}/docker-machine-`uname -s`-`uname -m` >/usr/local/bin/docker-machine && \ - chmod +x /usr/local/bin/docker-machine && \ # Cleanup rm -rf /var/cache/apk/* && rm -rf /tmp/* && rm -rf /var/log/* +COPY ./periodic /etc/periodic +COPY ./crontab /var/spool/cron/crontabs/root +RUN chmod +x -R /etc/periodic/ # Run the command on container startup #CMD cron && tail -f /var/log/cron.log diff --git a/dockerfiles/services/services/cron/docker-compose.yml b/dockerfiles/services/services/cron/docker-compose.yml index 1830832..9b39b96 100644 --- a/dockerfiles/services/services/cron/docker-compose.yml +++ b/dockerfiles/services/services/cron/docker-compose.yml @@ -8,17 +8,17 @@ # DOCKER_HOST=dkhost:2376 docker-compose exec -it cron_cron_1 /bin/sh -version: '3' +version: '3.4' services: cron: - image: "dkregistry.xai-corp.net:5000/cron:latest" + image: "dkregistry.xai-corp.net:5000/xaicorp/cron:latest" build: context: "" dockerfile: Dockerfile - volumes: - - /var/run/docker.sock:/var/run/docker.sock +# volumes: +# - /var/run/docker.sock:/var/run/docker.sock deploy: mode: replicated @@ -30,8 +30,18 @@ services: max_attempts: 3 resources: limits: - cpus: '0.5' - memory: 256M + cpus: '1' + memory: 8M + + logging: + driver: fluentd + options: + fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' + tag: cron + + networks: + - prod_app #networks: # default: diff --git a/dockerfiles/services/services/cron/periodic/15min/helloworld b/dockerfiles/services/services/cron/periodic/15min/helloworld deleted file mode 100644 index c70bff7..0000000 --- a/dockerfiles/services/services/cron/periodic/15min/helloworld +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "Hello world" >> /var/log/cron.log 2>&1 diff --git a/dockerfiles/services/services/cron/periodic/15min/nextcloud b/dockerfiles/services/services/cron/periodic/15min/nextcloud new file mode 100644 index 0000000..3ad7518 --- /dev/null +++ b/dockerfiles/services/services/cron/periodic/15min/nextcloud @@ -0,0 +1,3 @@ +#!/bin/sh + +curl -Ss --connect-timeout 2 https://xaibox.xai-corp.net/cron.php diff --git a/dockerfiles/services/services/cron/periodic/1min/abcapi-import.sh b/dockerfiles/services/services/cron/periodic/1min/abcapi-import.sh deleted file mode 100644 index 8f01a08..0000000 --- a/dockerfiles/services/services/cron/periodic/1min/abcapi-import.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# dkregistry.xai-corp.net:5000/xaicorp/abc-api/api:dev - -#docker run -d --name abcapi_scheduler \ -# -v /opt/shared/abcapi/storage/app:/opt/project/storage/app \ -# -e "APP_ENV: prod" \ -# -e "APP_DEBUG: 'false'" \ -# -e "APP_KEY: c578846e0a7fe6996d8cb259d375aaa0" \ -# -e "APP_TIMEZONE: UTC" \ -# -e "DB_CONNECTION: pgsqld"b \ -# -e "DB_HOST: services_postgres" \ -# -e "DB_PORT: 5432" \ -# -e "DB_DATABASE: abcapi_api" \ -# -e "DB_USERNAME: abcapi" \ -# -e "DB_PASSWORD: 'JAIobu3i18bC#2n2$$'" \ -# -e "CACHE_DRIVER: redis" \ -# -e "QUEUE_DRIVER: sync" \ -# dkregistry.xai-corp.net:5000/xaicorp/abc-api/api:latest \ -# php artisan schedule:run diff --git a/dockerfiles/services/services/cron/periodic/1min/hellominute b/dockerfiles/services/services/cron/periodic/1min/hellominute deleted file mode 100644 index 25ea98a..0000000 --- a/dockerfiles/services/services/cron/periodic/1min/hellominute +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "Hello minute" >> /var/log/cron.log 2>&1 diff --git a/dockerfiles/services/services/cron/periodic/1min/helloworld b/dockerfiles/services/services/cron/periodic/1min/helloworld new file mode 100644 index 0000000..81c33ad --- /dev/null +++ b/dockerfiles/services/services/cron/periodic/1min/helloworld @@ -0,0 +1,3 @@ +#!/bin/sh + +#echo "Hello world" >> /var/log/cron.log 2>&1 diff --git a/dockerfiles/services/services/launch_services.sh b/dockerfiles/services/services/launch_services.sh index 230eef0..4c254b4 100755 --- a/dockerfiles/services/services/launch_services.sh +++ b/dockerfiles/services/services/launch_services.sh @@ -21,6 +21,7 @@ docker-compose \ -f memcached/docker-compose.yml \ -f redis/docker-compose.yml \ -f datadog/docker-compose.yml \ + -f cron/docker-compose.yml \ config > $CONFIG