From 9c9f68e35339d9652fed7109b22f7af87a1bfdb9 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Sun, 29 Mar 2015 15:09:13 +0100 Subject: [PATCH 1/2] Switches to indiepaas repo --- dockerfiles/email/dovecot/Dockerfile | 2 +- dockerfiles/email/postfix/Dockerfile | 2 +- dockerfiles/services/known/Dockerfile | 2 +- dockerfiles/services/owncloud/Dockerfile | 2 +- dockerfiles/services/piwik/Dockerfile | 2 +- dockerfiles/services/wordpress/Dockerfile | 2 +- unit-files/backup@.service | 4 ++-- unit-files/confd.service | 2 +- unit-files/dovecot.service | 2 +- unit-files/haproxy.service | 2 +- unit-files/mysql@.service | 2 +- unit-files/postfix.service | 2 +- unit-files/rsyslog.service | 2 +- unit-files/web@.service | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dockerfiles/email/dovecot/Dockerfile b/dockerfiles/email/dovecot/Dockerfile index 73433ab..112cf10 100644 --- a/dockerfiles/email/dovecot/Dockerfile +++ b/dockerfiles/email/dovecot/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/base-email +FROM indiepaas/base-email RUN apt-get update && \ apt-get install -q -y \ diff --git a/dockerfiles/email/postfix/Dockerfile b/dockerfiles/email/postfix/Dockerfile index f6c317b..3f211dc 100644 --- a/dockerfiles/email/postfix/Dockerfile +++ b/dockerfiles/email/postfix/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/base-email +FROM indiepaas/base-email RUN apt-get update && \ apt-get install -q -y \ diff --git a/dockerfiles/services/known/Dockerfile b/dockerfiles/services/known/Dockerfile index e0eccb3..7c24346 100644 --- a/dockerfiles/services/known/Dockerfile +++ b/dockerfiles/services/known/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/apache +FROM indiepaas/apache # Download latest version of Known into /app RUN mkdir -p /app && \ diff --git a/dockerfiles/services/owncloud/Dockerfile b/dockerfiles/services/owncloud/Dockerfile index 6b1a5ec..b8c7cf9 100644 --- a/dockerfiles/services/owncloud/Dockerfile +++ b/dockerfiles/services/owncloud/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/nginx-php +FROM indiepaas/nginx-php # install owncloud RUN echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_7.0/ /' >> /etc/apt/sources.list.d/owncloud.list && \ diff --git a/dockerfiles/services/piwik/Dockerfile b/dockerfiles/services/piwik/Dockerfile index c967a46..02b8830 100644 --- a/dockerfiles/services/piwik/Dockerfile +++ b/dockerfiles/services/piwik/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/nginx-php +FROM indiepaas/nginx-php RUN apt-get update && apt-get install -y \ php5-gd \ diff --git a/dockerfiles/services/wordpress/Dockerfile b/dockerfiles/services/wordpress/Dockerfile index 15d60ad..a8acd0a 100644 --- a/dockerfiles/services/wordpress/Dockerfile +++ b/dockerfiles/services/wordpress/Dockerfile @@ -1,4 +1,4 @@ -FROM pierreozoux/apache +FROM indiepaas/apache # Download latest version of Wordpress into /app RUN curl -L https://wordpress.org/latest.tar.gz | tar xz && \ diff --git a/unit-files/backup@.service b/unit-files/backup@.service index 7c631ad..741b6a4 100644 --- a/unit-files/backup@.service +++ b/unit-files/backup@.service @@ -17,7 +17,7 @@ ExecStartPre=/bin/bash -euxc ' \ --name mysqldump-%i \ --link mysql-%i:db \ --env-file /data/domains/%i/mysql/.env \ - pierreozoux/mysql \ + indiepaas/mysql \ mysqldump \ --all-databases \ --events \ @@ -32,7 +32,7 @@ ExecStart=/bin/bash -euxc ' \ --name backup-%i \ -h backup.container \ -v /root:/root \ - -v /data/domains/%i:/backup pierreozoux/duplicity \ + -v /data/domains/%i:/backup indiepaas/duplicity \ --full-if-older-than 1W \ --encrypt-key ${ENCRYPT_KEY} \ /backup \ diff --git a/unit-files/confd.service b/unit-files/confd.service index 3b09cc4..3d2f997 100644 --- a/unit-files/confd.service +++ b/unit-files/confd.service @@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run \ --name %p \ -v /data/runtime/haproxy/:/etc/haproxy/ \ -v /var/run/docker.sock:/var/run/docker.sock \ - pierreozoux/confd + indiepaas/confd ExecReload=/usr/bin/docker restart %p ExecStop=/usr/bin/docker stop %p diff --git a/unit-files/dovecot.service b/unit-files/dovecot.service index 41d05e0..5c78788 100644 --- a/unit-files/dovecot.service +++ b/unit-files/dovecot.service @@ -30,7 +30,7 @@ ExecStart=/bin/bash -euxc ' \ --env-file=/data/domains/mail/.env \ --link mysql-mail:db \ -p 993:993 \ - pierreozoux/dovecot' + indiepaas/dovecot' ExecReload=/usr/bin/docker restart dovecot ExecStop=/usr/bin/docker stop dovecot diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service index 0a55ca9..bb156a4 100644 --- a/unit-files/haproxy.service +++ b/unit-files/haproxy.service @@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run \ -v /data/runtime/haproxy:/etc/haproxy \ -p 80:80 \ -p 443:443 \ - pierreozoux/haproxy + indiepaas/haproxy ExecReload=/usr/bin/docker restart %p ExecStop=/usr/bin/docker stop %p diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service index ce276a0..54c403f 100644 --- a/unit-files/mysql@.service +++ b/unit-files/mysql@.service @@ -37,7 +37,7 @@ ExecStart=/opt/bin/systemd-docker run \ -v /data/runtime/domains/%i/log/mysql:/var/log/mysql \ -v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \ --env-file /data/domains/%i/%p/.env \ - pierreozoux/mysql + indiepaas/mysql ExecReload=/usr/bin/docker restart %p-%i ExecStop=/usr/bin/docker stop %p-%i diff --git a/unit-files/postfix.service b/unit-files/postfix.service index 532dd05..99f821c 100644 --- a/unit-files/postfix.service +++ b/unit-files/postfix.service @@ -28,7 +28,7 @@ ExecStart=/usr/bin/docker run \ -p 25:25 \ -p 587:587 \ -link=mysql-mail:db \ - pierreozoux/postfix + indiepaas/postfix ExecReload=/usr/bin/docker restart %p ExecStop=/usr/bin/docker stop %p diff --git a/unit-files/rsyslog.service b/unit-files/rsyslog.service index 7c5d058..bc59fce 100644 --- a/unit-files/rsyslog.service +++ b/unit-files/rsyslog.service @@ -18,7 +18,7 @@ ExecStart=/usr/bin/docker run \ --name rsyslog \ -v /data/runtime/dev:/dev \ -v /data/runtime/log:/var/log \ - pierreozoux/rsyslog + indiepaas/rsyslog ExecReload=/usr/bin/docker restart %p ExecStop=/usr/bin/docker stop %p diff --git a/unit-files/web@.service b/unit-files/web@.service index 2c2daa7..ecb2ff4 100644 --- a/unit-files/web@.service +++ b/unit-files/web@.service @@ -30,7 +30,7 @@ ExecStart=/bin/bash -euxc ' \ --name %i \ -v /data/runtime/domains/%i/log/apache2:/var/log/apache2 \ ${DOCKER_ARGUMENTS} \ - pierreozoux/${APPLICATION}' + indiepaas/${APPLICATION}' ExecReload=/usr/bin/docker restart %i ExecStop=/usr/bin/docker stop %i -- GitLab From d74e21a68a4db849b9ba2340be4b26d4ddd42670 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Sun, 29 Mar 2015 15:27:47 +0100 Subject: [PATCH 2/2] moves to indiepaas --- scripts/install.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 69071b3..fa50658 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,18 +2,18 @@ /usr/bin/coreos-cloudinit --from-file=/var/lib/coreos-install/user_data -docker pull pierreozoux/rsyslog -docker pull pierreozoux/haproxy -docker pull pierreozoux/confd -docker pull pierreozoux/postfix -docker pull pierreozoux/dovecot -docker pull pierreozoux/nginx -docker pull pierreozoux/mysql -docker pull pierreozoux/wordpress -docker pull pierreozoux/known -docker pull pierreozoux/piwik -docker pull pierreozoux/owncloud -docker pull pierreozoux/duplicity +docker pull indiepaas/rsyslog +docker pull indiepaas/haproxy +docker pull indiepaas/confd +docker pull indiepaas/postfix +docker pull indiepaas/dovecot +docker pull indiepaas/nginx +docker pull indiepaas/mysql +docker pull indiepaas/wordpress +docker pull indiepaas/known +docker pull indiepaas/piwik +docker pull indiepaas/owncloud +docker pull indiepaas/duplicity docker pull ibuildthecloud/systemd-docker # Create Directory structure -- GitLab