From 6d729803e6920bee1208671ee8a6f3374031f034 Mon Sep 17 00:00:00 2001 From: ebreton Date: Tue, 14 Nov 2017 16:16:14 +0100 Subject: [PATCH 1/6] aligned mariaDB version with C2C cluster --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 871d6b539..b6b2a4907 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: db: - image: mysql:5.7 + image: mariadb:5.5 environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} volumes: From d70945992d88414446048d8dec0a5c90c126718e Mon Sep 17 00:00:00 2001 From: ebreton Date: Tue, 14 Nov 2017 16:16:31 +0100 Subject: [PATCH 2/6] added build directories for docker images --- build/httpd/Dockerfile | 26 +++++++++++++++ build/httpd/apache2.conf | 36 ++++++++++++++++++++ build/httpd/docker-entrypoint.sh | 30 +++++++++++++++++ build/httpd/server.cert | 34 +++++++++++++++++++ build/httpd/server.key | 52 +++++++++++++++++++++++++++++ build/mgmt/Dockerfile | 56 ++++++++++++++++++++++++++++++++ build/mgmt/bash_profile | 4 +++ build/mgmt/docker-entrypoint.sh | 6 ++++ 8 files changed, 244 insertions(+) create mode 100644 build/httpd/Dockerfile create mode 100644 build/httpd/apache2.conf create mode 100644 build/httpd/docker-entrypoint.sh create mode 100644 build/httpd/server.cert create mode 100644 build/httpd/server.key create mode 100644 build/mgmt/Dockerfile create mode 100644 build/mgmt/bash_profile create mode 100755 build/mgmt/docker-entrypoint.sh diff --git a/build/httpd/Dockerfile b/build/httpd/Dockerfile new file mode 100644 index 000000000..b6ccc2d85 --- /dev/null +++ b/build/httpd/Dockerfile @@ -0,0 +1,26 @@ +FROM debian:stretch +MAINTAINER Christophe Burki, christophe.burki@camptocamp.com + +RUN apt-get update && apt-get install -y --no-install-recommends \ + apache2 \ + ca-certificates \ + libapache2-mod-php7.0 \ + php7.0 \ + php7.0-gd \ + php7.0-curl \ + php7.0-mysql \ + php7.0-mbstring \ + php7.0-xml \ + && \ + apt-get -y autoremove && \ + apt-get clean + +COPY server.key /etc/apache2/ssl/ +COPY server.cert /etc/apache2/ssl/ +COPY apache2.conf /etc/apache2/ +COPY docker-entrypoint.sh / +RUN chmod a+x /docker-entrypoint.sh + +EXPOSE 80 443 + +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/build/httpd/apache2.conf b/build/httpd/apache2.conf new file mode 100644 index 000000000..27cc0a130 --- /dev/null +++ b/build/httpd/apache2.conf @@ -0,0 +1,36 @@ +DefaultRuntimeDir ${APACHE_RUN_DIR} +PidFile ${APACHE_PID_FILE} +Timeout 300 +KeepAlive On +MaxKeepAliveRequests 100 +KeepAliveTimeout 5 + +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} + +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +IncludeOptional mods-enabled/*.load +IncludeOptional mods-enabled/*.conf + +Include ports.conf + +AccessFileName .htaccess + + Require all denied + + + AllowOverride All + + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf diff --git a/build/httpd/docker-entrypoint.sh b/build/httpd/docker-entrypoint.sh new file mode 100644 index 000000000..01bb65b45 --- /dev/null +++ b/build/httpd/docker-entrypoint.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +cat > /etc/apache2/conf-available/dyn-vhost.conf < + SSLEngine on + SSLCertificateFile "/etc/apache2/ssl/server.cert" + SSLCertificateKeyFile "/etc/apache2/ssl/server.key" + +EOF + +/bin/mkdir -p /srv/${WP_ENV}/logs +/bin/chown -R www-data: /srv + +/usr/sbin/a2dissite 000-default +/usr/sbin/a2enmod ssl +/usr/sbin/a2enmod rewrite +/usr/sbin/a2enmod vhost_alias +/usr/sbin/a2enconf dyn-vhost + +/usr/sbin/apache2ctl -DFOREGROUND diff --git a/build/httpd/server.cert b/build/httpd/server.cert new file mode 100644 index 000000000..2878ec86b --- /dev/null +++ b/build/httpd/server.cert @@ -0,0 +1,34 @@ +-----BEGIN CERTIFICATE----- +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 +uqmV +-----END CERTIFICATE----- diff --git a/build/httpd/server.key b/build/httpd/server.key new file mode 100644 index 000000000..e3df7a8d3 --- /dev/null +++ b/build/httpd/server.key @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +JdwALRpBinayVyEp2TGwfDLQ2MA9kQ== +-----END PRIVATE KEY----- diff --git a/build/mgmt/Dockerfile b/build/mgmt/Dockerfile new file mode 100644 index 000000000..99a8aa715 --- /dev/null +++ b/build/mgmt/Dockerfile @@ -0,0 +1,56 @@ +FROM debian:stretch +MAINTAINER Christophe Burki, christophe.burki@camptocamp.com + +RUN apt-get update && apt-get install -y --no-install-recommends \ + bash-completion \ + curl \ + git \ + htop \ + less \ + make \ + mysql-client \ + openssh-server \ + tree \ + php7.0 \ + php7.0-cli \ + php7.0-curl \ + php7.0-mysql \ + python3 \ + python3-pip \ + python3-virtualenv \ + virtualenv \ + screen \ + unzip \ + vim && \ + curl -k -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \ + chmod a+x /usr/local/bin/wp && \ + apt-get clean + +RUN mkdir /var/run/sshd && \ + sed -ri 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config && \ + sed -ri 's/AcceptEnv LANG LC_\*/AcceptEnv LANG LC_\* WP_ENV/g' /etc/ssh/sshd_config && \ + sed -ri 's/#UsePrivilegeSeparation sandbox/UsePrivilegeSeparation no/g' /etc/ssh/sshd_config && \ + sed -ri 's/#?PermitRootLogin\s+.*/PermitRootLogin yes/g' /etc/ssh/sshd_config && \ + mkdir /tmp/openshift && \ + cd /tmp/openshift && \ + curl -L -O https://github.com/openshift/origin/releases/download/v3.6.0/openshift-origin-client-tools-v3.6.0-c4dd4cf-linux-64bit.tar.gz && \ + tar -xf openshift-origin-client-tools-v3.6.0-c4dd4cf-linux-64bit.tar.gz && \ + mv */oc /usr/local/bin && \ + cd / && \ + rm -rf /tmp/openshift && \ + mkdir /root/.ssh + +COPY ./bash_profile /var/www/.bash_profile +COPY ./docker-entrypoint.sh / + +RUN sed -ir 's#www-data.*:/usr/sbin/nologin#www-data:x:33:33:www-data:/var/www:/bin/bash#' /etc/passwd +RUN mkdir -p /var/www/.ssh +RUN chown -R www-data: /var/www +RUN chmod 700 /var/www/.ssh + +RUN su www-data -c "/usr/local/bin/wp package install git@github.com:diggy/polylang-cli.git" +RUN su www-data -c "/usr/local/bin/wp package install git@github.com:cortneyray/wp-cli-polylang.git" + +EXPOSE 22 +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["/usr/sbin/sshd", "-D"] diff --git a/build/mgmt/bash_profile b/build/mgmt/bash_profile new file mode 100644 index 000000000..adda45e20 --- /dev/null +++ b/build/mgmt/bash_profile @@ -0,0 +1,4 @@ +if [ -f /srv/.bashrc ]; then + . /srv/.bashrc +fi + diff --git a/build/mgmt/docker-entrypoint.sh b/build/mgmt/docker-entrypoint.sh new file mode 100755 index 000000000..ac337b7ce --- /dev/null +++ b/build/mgmt/docker-entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +chown -R www-data:www-data /var/www/.ssh +chmod 0700 /var/www/.ssh + +exec "$@" From 698d6c648d5c64f3a965b62447c70fbb3228a552 Mon Sep 17 00:00:00 2001 From: ebreton Date: Tue, 14 Nov 2017 16:35:41 +0100 Subject: [PATCH 3/6] use epflidevelop docker images instead of camptocamp ones --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b6b2a4907..921dfc5c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - /sessions httpd: - image: camptocamp/os-wp-httpd + image: epflidevelop/os-wp-httpd volumes: - ./volumes/srv:/srv links: @@ -33,7 +33,7 @@ services: mgmt: labels: ch.epfl.jahia2wp.mgmt.env: ${WP_ENV} - image: camptocamp/os-wp-mgmt + image: epflidevelop/os-wp-mgmt env_file: - .env environment: From 76bee9be89a9eb41da3d8f8f3981e80053961d19 Mon Sep 17 00:00:00 2001 From: ebreton Date: Tue, 14 Nov 2017 16:42:17 +0100 Subject: [PATCH 4/6] updated CHANGELOG for PR #77 --- docs/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8b165f370..c93e70146 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -32,19 +32,23 @@ Table of releases ## [0.2.13] - 2017-11-14 **[PR #70](https://github.com/epfl-idevelop/jahia2wp/pull/70)** -**[PR #75](https://github.com/epfl-idevelop/jahia2wp/pull/70)** +**[PR #75](https://github.com/epfl-idevelop/jahia2wp/pull/75)** +**[PR #77](https://github.com/epfl-idevelop/jahia2wp/pull/77): ** **High level changes:** 1. (#70) Infos de logging modifiées 1. (#70) Ajout de la gestion de "use cases" d'installation/désinstallation" de plugins spécifiques 1. (#75) added option `--force` on command `clean` +1. (#77) Need to reset DB (using 5.5 instead of 5.7) and containers (images location changed) **Low level changes:** 1. (#70) Ajout de check si un plugin est installé ou pas avant de tenter de l'installer ou de le désinstaller. 1. (#75) removed IF EXISTS when dropping user. 1. (#75) by-passing check_config in jahia2wp.py:clean when using option --force +1. (#77) added Dockerfiles image to build up `httpd` and `mgmt` docker images +1. (#77) aligned mariaDB version (5.5) with the one used on C2C infra ## [0.2.12] - 2017-11-09 From 11fe18d20493340f91aec02d26f6b88ccdee64ce Mon Sep 17 00:00:00 2001 From: ebreton Date: Tue, 14 Nov 2017 16:43:38 +0100 Subject: [PATCH 5/6] typo in CHANGELOG --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c93e70146..ec016499e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -33,7 +33,7 @@ Table of releases **[PR #70](https://github.com/epfl-idevelop/jahia2wp/pull/70)** **[PR #75](https://github.com/epfl-idevelop/jahia2wp/pull/75)** -**[PR #77](https://github.com/epfl-idevelop/jahia2wp/pull/77): ** +**[PR #77](https://github.com/epfl-idevelop/jahia2wp/pull/77)** **High level changes:** From af538bb12cf51600ef7240e9ef9720f7362c821d Mon Sep 17 00:00:00 2001 From: ebreton Date: Fri, 17 Nov 2017 10:45:33 +0100 Subject: [PATCH 6/6] updated version for release --- docs/CHANGELOG.md | 20 ++++++++++++++++---- src/settings.py | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index da0437dcd..f3a4c6e61 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -11,6 +11,7 @@ Table of releases +- [[0.2.14] - 2017-11-17](#0214---2017-11-17) - [[0.2.13] - 2017-11-14/15](#0213---2017-11-1415) - [[0.2.12] - 2017-11-09](#0212---2017-11-09) - [[0.2.11] - 2017-11-08](#0211---2017-11-08) @@ -29,12 +30,26 @@ Table of releases +## [0.2.14] - 2017-11-17 + +**[PR #77](https://github.com/epfl-idevelop/jahia2wp/pull/77)** + +**High level changes:** + +1. Tagged version after Sprint_S1711 +1. (#77) Need to reset DB (using 5.5 instead of 5.7) and containers (images location changed) + +**Low level changes:** + +1. (#77) added Dockerfiles image to build up `httpd` and `mgmt` docker images +1. (#77) aligned mariaDB version (5.5) with the one used on C2C infra + + ## [0.2.13] - 2017-11-14/15 **[PR #70](https://github.com/epfl-idevelop/jahia2wp/pull/70)** **[PR #75](https://github.com/epfl-idevelop/jahia2wp/pull/75)** **[PR #76](https://github.com/epfl-idevelop/jahia2wp/pull/76)** -**[PR #77](https://github.com/epfl-idevelop/jahia2wp/pull/77)** **[PR #80](https://github.com/epfl-idevelop/jahia2wp/pull/80)** **[PR #81](https://github.com/epfl-idevelop/jahia2wp/pull/81)** @@ -44,7 +59,6 @@ Table of releases 1. (#70) Ajout de la gestion de "use cases" d'installation/désinstallation" de plugins spécifiques 1. (#75) added option `--force` on command `clean` 1. (#76) Nouvelle option pour lister les plugins (`list-plugins`) ajoutée dans `jahia2wp.py`. Elle permet de lister les plugins qui seront installés (ainsi que leur config si on la veut) pour un site (donné par `wp_env` et `wp_url`) -1. (#77) Need to reset DB (using 5.5 instead of 5.7) and containers (images location changed) 1. (#80) added auto-configuration of polylang (with two languages: fr, en) 1. (#80) update `make vars` to display all env vars used in project 1. (#81) Cette PR ajoute un test fonctionnel à savoir : tester l'upload d'un média dans un site WP. @@ -58,8 +72,6 @@ Table of releases 1. (#76) Pas de test spécifique ajouté pour ceci car c'est juste de l'affichage et la génération de la liste de plugins pour un site est déjà testée. 1. (#76) Modifications dans `test_jahia2wp.py` pour utiliser des variables pour les infos sur les sites à tester au lieu de hard-coder à chaque fois. 1. (#76) Modification de WPSite.name qui joue le role d'ID du site WordPress pour l'instant. Pour un sous-domaine, la valeur retournée est le sous-domaine à la place du FQDN -1. (#77) added Dockerfiles image to build up `httpd` and `mgmt` docker images -1. (#77) aligned mariaDB version (5.5) with the one used on C2C infra 1. (#80) refactored code related to plugins -> new package `wordpress.plugins` 1. (#81) A noter que pour que les tests fonctionnent depuis le conteneur on utilise l'IP de Docker "172.17.0.1" qui potentiellement peut changer dans le futur. diff --git a/src/settings.py b/src/settings.py index c3bd0435d..20c8c3c5d 100644 --- a/src/settings.py +++ b/src/settings.py @@ -3,7 +3,7 @@ from utils import Utils -VERSION = "0.2.13" +VERSION = "0.2.14" # This Docker IP address is used for automatic testing. # Docker may change it in the future, which will cause some tests to fail.