diff --git a/compose/backup/docker-compose.yml b/compose/backup/docker-compose.yml index 76ac16f..09129f2 100644 --- a/compose/backup/docker-compose.yml +++ b/compose/backup/docker-compose.yml @@ -1,27 +1,69 @@ version: '3.8' volumes: - pictures: + dockerstorage: + driver_opts: + type: nfs + o: addr=dockerstorage,nfsvers=4 + device: :/dockerstorage + + git: driver_opts: type: nfs o: addr=maurice,nfsvers=4 - device: :/pictures + device: :/git + + bands: + driver_opts: + type: nfs + o: addr=julien,nfsvers=3 + device: :/Bands + configs: stackstorage: external: true services: - pictures: + dockerstorage: image: registry.vbchaos.nl/rclone:arm64 environment: - - COMMAND=rclone copy -v /backup/ stackstorage:/testfolder - - CRON_SCHEDULE=* 18-20 * * * + - COMMAND=rclone copy -v /backup/ stackstorage:/dockerstorage + - CRON_SCHEDULE=0 0 * * * configs: - source: stackstorage target: /config/rclone.conf volumes: - - pictures:/backup + - dockerstorage:/backup + deploy: + mode: replicated + replicas: 1 + + git: + image: registry.vbchaos.nl/rclone:arm64 + environment: + - COMMAND=rclone copy -v /backup/ stackstorage:/git + - CRON_SCHEDULE=0 1 * * * + configs: + - source: stackstorage + target: /config/rclone.conf + volumes: + - git:/backup + deploy: + mode: replicated + replicas: 1 + + + bands: + image: registry.vbchaos.nl/rclone:arm64 + environment: + - COMMAND=rclone copy -v /backup/ stackstorage:/testbackup + - CRON_SCHEDULE=* 0 2 * * * + configs: + - source: stackstorage + target: /config/rclone.conf + volumes: + - bands:/backup deploy: mode: replicated replicas: 1 diff --git a/compose/backup/start.sh b/compose/backup/start.sh index 9e84b14..f2ce680 100755 --- a/compose/backup/start.sh +++ b/compose/backup/start.sh @@ -1 +1 @@ -docker stack deploy -c docker-compose.yml --with-registry-auth backuppictures +docker stack deploy -c docker-compose.yml --with-registry-auth backup diff --git a/compose/jenkins/docker-compose.yml b/compose/jenkins/docker-compose.yml index 62c7544..8644fa5 100644 --- a/compose/jenkins/docker-compose.yml +++ b/compose/jenkins/docker-compose.yml @@ -6,29 +6,29 @@ volumes: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/swarm/stacks/jenkins/home + device: :/dockerstorage/jenkins/home jenkins_certs: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/swarm/stacks/jenkins/certs + device: :/dockerstorage/jenkins/certs services: jenkins: - image: docker:5000/jenkins-docker + image: registry.vbchaos.nl/jenkins-docker ports: - 8080:8080 - 50000:50000 - environment: - - DOCKER_CERT_PATH=/certs/client - - DOCKER_TLS_VERIFY=1 +# environment: +# - DOCKER_CERT_PATH=/certs/client +# - DOCKER_TLS_VERIFY=1 deploy: placement: constraints: - "node.labels.highperformance==YES" volumes: - jenkins_home:/var/jenkins_home - - jenkins_certs:/certs/client +# - jenkins_certs:/certs/client - /var/run/docker.sock:/var/run/docker.sock