Added support for the edx.org marketing site

ECOM-6626

.travis.yml

@@ -14,3 +14,4 @@ before_install:
 script:
   - make provision
   - make healthchecks
+  - make up-marketing-detached

Makefile

 .DEFAULT_GOAL := help
 
+include *.mk
+
 # Generates a help message. Borrowed from https://github.com/pydanny/cookiecutter-djangopackage.
 help: ## Display this help message
 	@echo "Please use \`make <target>' where <target> is one of"

README.md

@@ -159,6 +159,11 @@ docker exec -t edx.devstack.<service> bash -c '/edx/app/supervisor/venvs/supervi
 * lms
 * studio
 
+## Marketing Site
+
+Docker Compose files useful for integrating with the edx.org marketing site are available. This will NOT be useful to
+those outside of edX. For details on getting things up and running, see
+https://openedx.atlassian.net/wiki/display/ENG/Marketing+Site.
 
 ## Remaining Work
 

docker-compose-marketing-site-host.yml

+version: "2.1"
+
+services:
+  marketing:
+    volumes:
+      - ../edx-mktg/docroot:/var/www/html

docker-compose-marketing-site-sync.yml

+version: "2.1"
+
+services:
+  marketing:
+    volumes:
+      - marketing-sync:/var/www/html:rw
+
+volumes:
+  marketing-sync:
+    external: true

docker-compose-marketing-site.yml

+version: "2.1"
+
+services:
+  lms:
+    environment:
+      - ENABLE_MARKETING_SITE=1
+      - MARKETING_SITE_ROOT="http://localhost:8080"
+
+  marketing:
+    container_name: edx.devstack.marketing
+    depends_on:
+      - mysql
+      - memcached
+    environment:
+      - DB_HOST=edx.devstack.mysql
+      - DB_NAME=edxmktg
+      - DB_PASSWORD=password
+      - DB_USER=edxmktg001
+      - DRUPAL_EXTRA_SETTINGS=/var/www/html/sites/default/docker.settings.php
+      - LMS_HOST=http://localhost:18000
+      - MEMCACHE_HOST=edx.devstack.memcached
+    image: edxops/edx-mktg:latest
+    ports:
+      - "8080:80"

docker-sync-marketing-site.yml

+version: "2"
+
+options:
+  compose-file-path:
+    - 'docker-compose.yml'
+    - 'docker-compose-marketing-site.yml'
+  compose-dev-file-path:
+    - 'docker-compose-sync.yml'
+    - 'docker-compose-marketing-site-sync.yml'
+
+syncs:
+  credentials-sync:
+    src: '../credentials/'
+    dest: '/edx/app/credentials/credentials'
+    sync_args: '-v --copy-links --hard-links'
+    sync_excludes: [ '.git', '.idea', 'node_modules', 'credentials/assets', 'credentials/static/bundles' ]
+    sync_host_ip: 'localhost'
+    sync_host_port: 10872
+    sync_strategy: 'rsync'
+
+  discovery-sync:
+    src: '../course-discovery/'
+    dest: '/edx/app/discovery/discovery'
+    sync_args: '-v --copy-links --hard-links'
+    sync_excludes: [ '.git', '.idea', 'node_modules', 'course_discovery/assets', 'course_discovery/static/bower_components', 'course_discovery/static/build' ]
+    sync_host_ip: 'localhost'
+    sync_host_port: 10873
+    sync_strategy: 'rsync'
+
+  ecommerce-sync:
+    src: '../ecommerce/'
+    dest: '/edx/app/ecommerce/ecommerce'
+    sync_args: '-v --copy-links --hard-links'
+    sync_excludes: [ '.git', '.idea', 'node_modules', 'assets', 'ecommerce/static/bower_components', 'ecommerce/static/build' ]
+    sync_host_ip: 'localhost'
+    sync_host_port: 10874
+    sync_strategy: 'rsync'
+
+  edxapp-sync:
+    src: '../edx-platform/'
+    dest: '/edx/app/edxapp/edx-platform'
+    sync_args: '-v --copy-links --hard-links'
+    sync_excludes: [ '.git', '.idea', 'node_modules', '.prereqs_cache' ]
+    sync_host_ip: 'localhost'
+    sync_host_port: 10875
+    sync_strategy: 'rsync'
+
+  marketing-sync:
+    src: '../edx-mktg/docroot/'
+    dest: '/var/www/html'
+    sync_args: '-v --copy-links --hard-links'
+    sync_excludes: [ '.git', '.idea', 'node_modules', ]
+    sync_host_ip: 'localhost'
+    sync_host_port: 10876
+    sync_strategy: 'rsync'
+    sync_user: 'www-data'
+    sync_userid: 33

marketing.mk

+marketing-shell: ## Run a shell on the marketing site container
+	docker exec -it edx.devstack.marketing env TERM=$(TERM) bash
+
+up-marketing:   ## Bring up all services (including the marketing site) with host volumes
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
+
+up-marketing-detached:   ## Bring up all services (including the marketing site) with host volumes (in detached mode)
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
+
+up-marketing-sync:  ## Bring up all services (including the marketing site) with docker-sync
+	docker-sync-stack start -c docker-sync-marketing-site.yml
+
+clean-marketing-sync:   ## Remove the docker-sync containers for all services (including the marketing site)
+	docker-sync-stack clean -c docker-sync-marketing-site.yml

provision.sql

@@ -7,6 +7,9 @@ GRANT ALL ON discovery.* TO 'discov001'@'%' IDENTIFIED BY 'password';
 CREATE DATABASE IF NOT EXISTS ecommerce;
 GRANT ALL ON ecommerce.* TO 'ecomm001'@'%' IDENTIFIED BY 'password';
 
+CREATE DATABASE IF NOT EXISTS edxmktg;
+GRANT ALL ON edxmktg.* TO 'edxmktg001'@'%' 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';