# This is a combination of 12 commits.

asamolion · asamolion · commit ccfe2010e224 · 2019-04-24T18:35:31.000+05:00
# This is the 1st commit message: ADD: add clone feature for edly wp repos # The commit message #2 will be skipped: # ADD: add wordpress clone support # The commit message #3 will be skipped: # WIP: add WP container # The commit message #4 will be skipped: # ADD: add config for wordpress plugins, themes and env # The commit message #5 will be skipped: # MOD: refine the config for WP container # The commit message #6 will be skipped: # ADD: add custom build script for edly/wp docker image # The commit message #7 will be skipped: # FIX: remove unnecessary keys # The commit message #8 will be skipped: # FIX: add correct settings in wp-config.php # The commit message #9 will be skipped: # MOD: add custom config for WP image # The commit message #10 will be skipped: # FIX: use proper docker image # The commit message #11 will be skipped: # ADD: add must install wp plugins # The commit message #12 will be skipped: # FIX: fix version of wordpress docker image
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
-Open edX Devstack |Build Status|
-================================
+Edly's Open edX Devstack
+========================
 
-Get up and running quickly with Open edX services.
+Get up and running quickly with Edly's Open edX services.
 
 If you are seeking info on the Vagrant-based devstack, please see
 https://openedx.atlassian.net/wiki/spaces/OpenOPS/pages/60227787/Running+Vagrant-based+Devstack. This
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
@@ -7,7 +7,7 @@ services:
       - credentials_node_modules:/edx/app/credentials/credentials/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   discovery:
-      volumes:
+    volumes:
       - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
       - discovery_node_modules:/edx/app/discovery/discovery/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
@@ -37,7 +37,7 @@ services:
     volumes:
       - ${DEVSTACK_WORKSPACE}/gradebook:/edx/app/gradebook:cached
       - gradebook_node_modules:/edx/app/gradebook/node_modules
-      
+
 volumes:
   credentials_node_modules:
   discovery_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edx.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '2.1'
 
 services:
   # Third-party services
@@ -18,8 +18,8 @@ services:
     image: edxops/chrome:${OPENEDX_RELEASE:-latest}
     shm_size: 2g
     ports:
-      - "15900:5900"
-    volumes:  # for file uploads
+      - '15900:5900'
+    volumes: # for file uploads
       - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
       - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
@@ -41,8 +41,8 @@ services:
     image: edxops/firefox:${OPENEDX_RELEASE:-latest}
     shm_size: 2g
     ports:
-      - "25900:5900"
-    volumes:  # for file uploads
+      - '25900:5900'
+    volumes: # for file uploads
       - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
       - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
@@ -71,8 +71,8 @@ services:
     container_name: edx.devstack.mysql
     hostname: mysql.devstack.edx
     environment:
-      MYSQL_ROOT_PASSWORD: ""
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ROOT_PASSWORD: ''
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     image: mysql:5.6
     # ports:
     #   - "3306:3306"
@@ -97,7 +97,7 @@ services:
       ENABLE_DJANGO_TOOLBAR: 1
     image: edxops/credentials:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18150:18150"
+      - '18150:18150'
 
   discovery:
     command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done'
@@ -111,11 +111,11 @@ services:
     stdin_open: true
     tty: true
     environment:
-      TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
+      TEST_ELASTICSEARCH_URL: 'http://edx.devstack.elasticsearch:9200'
       ENABLE_DJANGO_TOOLBAR: 1
     image: edxops/discovery:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18381:18381"
+      - '18381:18381'
     volumes:
       - discovery_assets:/edx/var/discovery/
 
@@ -133,7 +133,7 @@ services:
       ENABLE_DJANGO_TOOLBAR: 1
     image: edxops/ecommerce:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18130:18130"
+      - '18130:18130'
 
   lms:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
@@ -155,8 +155,8 @@ services:
       NO_PYTHON_UNINSTALL: 1
     image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18000:18000"
-      - "19876:19876" # JS test debugging
+      - '18000:18000'
+      - '19876:19876' # JS test debugging
       # - "18003:18003"
       # - "18031:18031"
     volumes:
@@ -172,16 +172,16 @@ services:
       - mysql
     image: edxops/notes:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18120:18120"
+      - '18120:18120'
     environment:
-      DB_ENGINE: "django.db.backends.mysql"
-      DB_HOST: "edx.devstack.mysql"
-      DB_NAME: "notes"
-      DB_PASSWORD: "password"
-      DB_PORT: "3306"
-      DB_USER: "notes001"
+      DB_ENGINE: 'django.db.backends.mysql'
+      DB_HOST: 'edx.devstack.mysql'
+      DB_NAME: 'notes'
+      DB_PASSWORD: 'password'
+      DB_PORT: '3306'
+      DB_USER: 'notes001'
       ENABLE_DJANGO_TOOLBAR: 1
-      ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
+      ELASTICSEARCH_URL: 'http://edx.devstack.elasticsearch:9200'
 
   studio:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 2; done'
@@ -203,8 +203,8 @@ services:
       NO_PYTHON_UNINSTALL: 1
     image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
-      - "18010:18010"
-      - "19877:19877" # JS test debugging
+      - '18010:18010'
+      - '19877:19877' # JS test debugging
       # - "18103:18103"
       # - "18131:18131"
     volumes:
@@ -220,14 +220,14 @@ services:
       - elasticsearch
     image: edxops/forum:${OPENEDX_RELEASE:-latest}
     ports:
-      - "44567:4567"
+      - '44567:4567'
 
   devpi:
     container_name: edx.devstack.devpi
     hostname: devpi.devstack.edx
     image: edxops/devpi:${OPENEDX_RELEASE:-latest}
     ports:
-      - "3141:3141"
+      - '3141:3141'
     volumes:
       - devpi_data:/data
 
@@ -237,10 +237,22 @@ services:
     container_name: edx.devstack.gradebook
     image: node:10
     ports:
-      - "1994:1994"
+      - '1994:1994'
     environment:
       - NODE_ENV=development
-      
+
+  wordpress:
+    depends_on:
+      - mysql
+    image: asamolion/edly-wp:latest
+    hostname: wp.devstack.edx
+    container_name: edx.devstack.wp
+    ports:
+      - '8888:80'
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/wp_plugins/edly-wp-plugin:/var/www/html/wp-content/plugins/edly-wp-plugin
+      - ${DEVSTACK_WORKSPACE}/wp_themes/edly-wp-theme:/var/www/html/wp-content/themes/edly-wp-theme
+
 volumes:
   discovery_assets:
   edxapp_lms_assets:
diff --git a/provision.sql b/provision.sql
@@ -16,6 +16,10 @@ GRANT ALL ON notes.* TO 'notes001'@'%' IDENTIFIED BY 'password';
 CREATE DATABASE IF NOT EXISTS registrar;
 GRANT ALL ON registrar.* TO 'registrar001'@'%' IDENTIFIED BY 'password';
 
+
+CREATE DATABASE IF NOT EXISTS wordpress;
+GRANT ALL ON wordpress.* TO 'wordpress001'@'%' IDENTIFIED BY 'password';
+
 CREATE DATABASE IF NOT EXISTS edxapp;
 CREATE DATABASE IF NOT EXISTS edxapp_csmh;
 GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password';
diff --git a/repo.sh b/repo.sh
@@ -41,7 +41,17 @@ private_repos=(
     "https://github.com/edx/edx-themes.git"
 )
 
+wp_plugin_repos=(
+    "git@github.com:edly-io/edly-wp-plugin.git"
+)
+
+wp_theme_repos=(
+    "git@github.com:edly-io/edly-wp-theme.git"
+)
+
 name_pattern=".*/(.*).git"
+eldy_repo_pattern=".*edly-io/(.*).git"
+
 
 _checkout ()
 {
@@ -115,9 +125,51 @@ _checkout_and_update_branch ()
     find . -name '*.pyc' -not -path './.git/*' -delete
 }
 
+
+_get_latest_wp_tag() {
+ curl --silent "https://api.github.com/repos/WordPress/WordPress/tags" | # Get latest release from GitHub>
+    python -c "import sys, json; print json.load(sys.stdin)[0]['name']"
+}
+
 clone ()
 {
     _clone "${repos[@]}"
+
+    WP_PLUGIN_DIR=$DEVSTACK_WORKSPACE/wp_plugins
+    WP_THEME_DIR=$DEVSTACK_WORKSPACE/wp_themes
+
+    [ -d $WP_PLUGIN_DIR ] || mkdir $WP_PLUGIN_DIR
+    [ -d $WP_THEME_DIR ] || mkdir $WP_THEME_DIR
+
+    # clone WP plugins
+    cd $WP_PLUGIN_DIR
+    for repo in "${wp_plugin_repos[@]}"
+    do
+        [[ $repo =~ $eldy_repo_pattern ]]
+        name="${BASH_REMATCH[1]}"
+
+        if [ ! -d $name ]; then
+          git clone $repo --branch develop
+        else
+          printf "The [%s] repo is already checked out. \n" $repo
+        fi
+    done
+
+    # clone themes
+    cd $WP_THEME_DIR
+    for repo in "${wp_theme_repos[@]}"
+    do
+        [[ $repo =~ $eldy_repo_pattern ]]
+        name="${BASH_REMATCH[1]}"
+
+        if [ ! -d $name ]; then
+          git clone $repo --branch develop
+        else
+          printf "The [%s] repo is already checked out. \n" $repo
+        fi
+    done
+
+    cd $DEVSTACK_WORKSPACE/devstack &> /dev/null
 }
 
 clone_private ()
diff --git a/wordpress/Dockerfile b/wordpress/Dockerfile
@@ -0,0 +1,88 @@
+FROM php:7.2-apache
+
+# install the PHP extensions we need
+RUN set -ex; \
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y \
+		unzip \
+		libjpeg-dev \
+		libpng-dev \
+	; \
+	\
+	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-install gd mysqli opcache zip; \
+	\
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual;
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
+RUN { \
+		echo 'error_reporting = 4339'; \
+		echo 'display_errors = Off'; \
+		echo 'display_startup_errors = Off'; \
+		echo 'log_errors = On'; \
+		echo 'error_log = /dev/stderr'; \
+		echo 'log_errors_max_len = 1024'; \
+		echo 'ignore_repeated_errors = On'; \
+		echo 'ignore_repeated_source = Off'; \
+		echo 'html_errors = Off'; \
+	} > /usr/local/etc/php/conf.d/error-logging.ini
+
+RUN a2enmod rewrite expires
+
+ARG WORDPRESS_DIR=/var/www/html
+ENV WORDPRESS_VERSION 5.1.1
+ENV WORDPRESS_SHA1 f1bff89cc360bf5ef7086594e8a9b68b4cbf2192
+
+RUN set -ex; \
+	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
+	echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
+	tar -xzf wordpress.tar.gz -C /usr/src/; \
+	rm wordpress.tar.gz; \
+	chown -R www-data:www-data /usr/src/wordpress
+
+
+RUN cp -R /usr/src/wordpress/. $WORDPRESS_DIR
+
+ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/edunext-openedx-integrator.1.9.0.zip" $WORDPRESS_DIR/wp-content/plugins/
+ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/advanced-custom-fields.5.7.12.zip" $WORDPRESS_DIR/wp-content/plugins/
+ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/elementor.2.5.14.zip" $WORDPRESS_DIR/wp-content/plugins/
+ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/classic-editor.1.4.zip" $WORDPRESS_DIR/wp-content/plugins/
+
+RUN unzip -d $WORDPRESS_DIR/wp-content/plugins/ '/var/www/html/wp-content/plugins/*.zip'; \
+	rm $WORDPRESS_DIR/wp-content/plugins/*.zip; \
+	ls $WORDPRESS_DIR/wp-content/plugins/
+
+RUN rm -rf $WORDPRESS_DIR/wp-content/plugins/akismet; \
+    rm $WORDPRESS_DIR/wp-content/plugins/hello.php
+
+RUN chown -R www-data:www-data $WORDPRESS_DIR
+
+COPY ./wp-config.php $WORDPRESS_DIR/
+
+VOLUME $WORDPRESS_DIR
+
+
+CMD ["apache2-foreground"]
diff --git a/wordpress/wp-config.php b/wordpress/wp-config.php
