From 83b8bfc58a8d3b2823fc71550c004f742c043f1e Mon Sep 17 00:00:00 2001 From: yohan <783b8c87@scimetis.net> Date: Thu, 11 Jul 2019 16:53:30 +0200 Subject: [PATCH] Added building from git repos. Added launch script with secrets retrieval. --- docker-compose.yml | 7 +++++-- start_or_update.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100755 start_or_update.sh diff --git a/docker-compose.yml b/docker-compose.yml index 007a6e1..6cca7b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,8 @@ version: "2.1" services: mysql-server: - image: mysql-server + image: mysql-server:$VERSION_MYSQL + build: "https://git.scimetis.net/yohan/docker-mysql.git" container_name: mysql-server restart: always networks: @@ -12,9 +13,11 @@ services: - mysql-server_data:/var/lib/mysql:Z - mysql-server_dumps:/mnt/dumps:Z - ./nettoyer_quotas.sh:/root/nettoyer_quotas.sh:Z + - ./debian.cnf:/etc/mysql/debian.cnf:Z cron: - image: cron + image: cron:$VERSION_CRON + build: "https://git.scimetis.net/yohan/docker-cron.git" restart: always network_mode: "host" volumes: diff --git a/start_or_update.sh b/start_or_update.sh new file mode 100755 index 0000000..44e26fd --- /dev/null +++ b/start_or_update.sh @@ -0,0 +1,10 @@ +#!/bin/bash +test -f ~/secrets.tar.gz.enc || curl -o ~/secrets.tar.gz.enc https://cloud.scimetis.net/s/$KEY/download +openssl enc -aes-256-cbc -d -in ~/secrets.tar.gz.enc | tar -zxv --strip 2 secrets/docker-mysql-stack/crontab secrets/docker-mysql-stack/debian.cnf +sudo chown root. crontab debian.cnf +# --force-recreate is used to recreate container when crontab file has changed +unset VERSION_MYSQL VERSION_CRON +VERSION_MYSQL=$(git ls-remote ssh://git@git.scimetis.net:2222/yohan/docker-mysql.git| head -1 | cut -f 1|cut -c -10) \ +VERSION_CRON=$(git ls-remote ssh://git@git.scimetis.net:2222/yohan/docker-cron.git| head -1 | cut -f 1|cut -c -10) \ + sudo -E bash -c 'docker-compose up -d --force-recreate' +rm -f crontab debian.cnf