<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[8991] sites/trunk/wordcamp.org: WordCamp Docker: Setup fully-trusted SSL certs for testing service workers.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8991">8991</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8991","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-06-25 20:47:09 +0000 (Tue, 25 Jun 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Docker: Setup fully-trusted SSL certs for testing service workers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgdockerDockerfile">sites/trunk/wordcamp.org/.docker/Dockerfile</a></li>
<li><a href="#sitestrunkwordcamporgdockerinstallpluginthemesh">sites/trunk/wordcamp.org/.docker/install-plugin-theme.sh</a></li>
<li><a href="#sitestrunkwordcamporgdockernginxconf">sites/trunk/wordcamp.org/.docker/nginx.conf</a></li>
<li><a href="#sitestrunkwordcamporgdockerreadmemd">sites/trunk/wordcamp.org/.docker/readme.md</a></li>
<li><a href="#sitestrunkwordcamporgdockerwpconfigphp">sites/trunk/wordcamp.org/.docker/wp-config.php</a></li>
<li><a href="#sitestrunkwordcamporggitignore">sites/trunk/wordcamp.org/.gitignore</a></li>
<li><a href="#sitestrunkwordcamporgdockercomposeyaml">sites/trunk/wordcamp.org/docker-compose.yaml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgdockerwordcampsslconf">sites/trunk/wordcamp.org/.docker/wordcamp.ssl.conf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgdockerDockerfile"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/Dockerfile</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/Dockerfile 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/Dockerfile 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,11 +69,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> COPY nginx.conf /etc/nginx/sites-enabled/wordcamp.conf
</span><span class="cx" style="display: block; padding: 0 10px"> COPY php-fpm.conf /usr/local/etc/php-fpm.d/zz-www.conf
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Install and configure SSL
-COPY wordcamp.ssl.conf /var/wordcamp.ssl.conf
-RUN cd ~ && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout wordcamp.key -out wordcamp.crt -config /var/wordcamp.ssl.conf
-RUN cp ~/wordcamp.crt /etc/ssl/certs/wordcamp.crt
-RUN cp ~/wordcamp.key /etc/ssl/private/wordcamp.key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Install SSL certificate
+COPY wordcamp.test.pem /etc/ssl/certs/wordcamp.test.pem
+COPY wordcamp.test.key.pem /etc/ssl/private/wordcamp.test.key.pem
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Add script to install plugin and themes
</span><span class="cx" style="display: block; padding: 0 10px"> ADD install-plugin-theme.sh /usr/src/public_html/install-plugin-theme.sh
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install less -y
</span><span class="cx" style="display: block; padding: 0 10px"> COPY wp-cli.yml /usr/src/public_html/wp-cli.yml
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Install MailCatcher.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Install MailCatcher
</ins><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install build-essential libsqlite3-dev ruby-dev -y
</span><span class="cx" style="display: block; padding: 0 10px"> RUN gem install mailcatcher --no-ri --no-rdoc
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install ssmtp -y
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,8 +103,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Utils
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install vim -y
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+RUN apt-get install nano -y
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-COPY wp-config.php /usr/src/public_html/wp-config.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# shouldn't need this b/c it's mounted in docker-compose- COPY wp-config.php /usr/src/public_html/wp-config.php
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Replace nginx default conf because it conflicts with wordcamp.conf
</span><span class="cx" style="display: block; padding: 0 10px"> RUN mv /etc/nginx/sites-enabled/wordcamp.conf /etc/nginx/sites-enabled/default
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockerinstallpluginthemesh"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/install-plugin-theme.sh</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/install-plugin-theme.sh 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/install-plugin-theme.sh 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Install plugins
</span><span class="cx" style="display: block; padding: 0 10px"> echo "Installing plugins"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-wp --allow-root plugin install akismet buddypress bbpress jetpack wp-multibyte-patch wordpress-importer polldaddy liveblog wp-super-cache custom-content-width camptix-network-tools email-post-changes tagregator supportflow camptix-pagseguro camptix-payfast-gateway camptix-trustpay camptix-trustcard camptix-mercadopago camptix-kdcpay-gateway campt-indian-payment-gateway camptix classic-editor
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp --allow-root plugin install akismet buddypress bbpress jetpack wp-multibyte-patch wordpress-importer polldaddy pwa liveblog wp-super-cache custom-content-width camptix-network-tools email-post-changes tagregator supportflow camptix-pagseguro camptix-payfast-gateway camptix-trustpay camptix-trustcard camptix-mercadopago camptix-kdcpay-gateway campt-indian-payment-gateway camptix classic-editor
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Install themes
</span><span class="cx" style="display: block; padding: 0 10px"> echo "Installing themes"
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockernginxconf"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/nginx.conf</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/nginx.conf 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/nginx.conf 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> server 127.0.0.1:9000;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Redirect HTTP to HTTPS
</ins><span class="cx" style="display: block; padding: 0 10px"> server {
</span><span class="cx" style="display: block; padding: 0 10px"> listen 80 default_server;
</span><span class="cx" style="display: block; padding: 0 10px"> listen [::]:80;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,13 +12,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 301 https://$host$request_uri;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# HTTPS Server
</ins><span class="cx" style="display: block; padding: 0 10px"> server {
</span><span class="cx" style="display: block; padding: 0 10px"> listen 443 ssl http2;
</span><span class="cx" style="display: block; padding: 0 10px"> listen [::]:443 ssl http2;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> server_name wordcamp.test;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ssl_certificate /etc/ssl/certs/wordcamp.crt;
- ssl_certificate_key /etc/ssl/private/wordcamp.key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ssl_certificate /etc/ssl/certs/wordcamp.test.pem;
+ ssl_certificate_key /etc/ssl/private/wordcamp.test.key.pem;
</ins><span class="cx" style="display: block; padding: 0 10px"> ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> root /usr/src/public_html/mu;
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockerreadmemd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/readme.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/readme.md 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/readme.md 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,55 +1,74 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Follow these steps to setup WordCamp.org using [Docker](https://www.docker.com/).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+## Initial Setup
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Follow these steps to setup a local WordCamp.org environment using [Docker](https://www.docker.com/).
+
</ins><span class="cx" style="display: block; padding: 0 10px"> **Note:** This will create `.docker/database` directory which will contain MySQL files to persist data across docker restarts.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. Make sure you have Docker installed and Docker daemon running on your system.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. Clone the repo:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ```bash
+ git clone git@github.com:WordPress/wordcamp.org.git wordcamp.test
+ cd wordcamp.test
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- git clone git@github.com:WordPress/wordcamp.org.git
- ```
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. Change into the directory, and run Docker's `compose` command. This could take some time depending upon the speed of your Internet connection.
- ```
- cd wordcamp.org && docker-compose up --build -d
- ```
- This will also start the docker environment for WordCamp.org development. At the end of the process, you should see these messages:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. Generate and trust the SSL certificates, so you get a green bar and can adequately test service workers.
+ ```bash
+ brew install mkcert
+ brew install nss
+ mkcert -install
+ mkcert -cert-file wordcamp.test.pem -key-file wordcamp.test.key.pem wordcamp.test *.wordcamp.test *.content.wordcamp.test *.new-site.wordcamp.test *.misc.wordcamp.test *.atlanta.wordcamp.test *.sf.wordcamp.test *.seattle.wordcamp.test *.columbus.wordcamp.test *.toronto.wordcamp.test *.us.wordcamp.test *.rhodeisland.wordcamp.test buddycamp.test *.buddycamp.test *.brighton.buddycamp.test
+ ```
+
+ _Note: That list of domains is generated with `docker-compose exec wordcamp.test wp site list --field=url`, but that command won't be available until after you've built the environment in the next steps._
+
+ _Note: When adding a new domain to your local environment, make sure you add it to the example above, and commit the change, so that others can just copy/paste the command, rather than re-doing the work of generating the full list. Add `*.{city}.wordcamp.test` rather than specific years like `2019.{city}.wordcamp.test`. Third-level domains like `central.wordcamp.test` are already covered by the `*.wordcamp.test`, and should not be added to the list._
+
+1. Build and boot the Docker environment.
+ ```bash
+ docker-compose up --build -d
+ ```
+
+ It could take some time depending upon the speed of your Internet connection. At the end of the process, you should see these messages:
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Creating wordcamporg_wordcamp.db_1 ... done
- Creating wordcamporg_wordcamp.test_1 ... done
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Creating wordcamporg_wordcamp.db_1 ... done
+ Creating wordcamporg_wordcamp.test_1 ... done
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. Add the following resolutions to your host file:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _Note: You won't be able to test in your browser just yet, so continue with the next steps._
+
+1. Add all the sites listed to your hosts file.
+ To get the list of sites, run the following command, and then remove the `http(s)://` prefix and `/` suffix.
+
+ ```bash
+ docker-compose exec wordcamp.test wp site list --field=url --allow-root
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 127.0.0.1 central.wordcamp.test
- 127.0.0.1 wordcamp.test
- 127.0.0.1 2014.content.wordcamp.test
- 127.0.0.1 2014.misc.wordcamp.test
- 127.0.0.1 2014.new-site.wordcamp.test
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ Example hosts file entry:
+ ```bash
+ 127.0.0.1 central.wordcamp.test plan.wordcamp.test 2014.content.wordcamp.test 2014.misc.wordcamp.test 2016.misc.wordcamp.test 2014.atlanta.wordcamp.test 2013.sf.wordcamp.test 2014.seattle.wordcamp.test 2014.columbus.wordcamp.test 2014.toronto.wordcamp.test 2014.sf.wordcamp.test buddycamp.test 2015.brighton.buddycamp.test 2015-experienced.seattle.wordcamp.test 2015-beginner.seattle.wordcamp.test 2015.us.wordcamp.test 2015.rhodeisland.wordcamp.test new-site.wordcamp.test 2014.new-site.wordcamp.test 2019.seattle.wordcamp.test
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `/wp-admin` pages for these sites should now be accessible. Use `admin` as username and `password` as password to login. Front end pages will not be accessible until you complete the remaining steps.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. The installation doesn't have any 3rd-party plugins or themes yet, you must add them like so:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- **Note:** `https` URL scheme must be used to visit these sites. Security exception will be required in first time run.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ```bash
+ docker-compose exec wordcamp.test sh install-plugin-theme.sh
+ ```
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. The installation doesn't have any 3rd-party plugins or themes yet, you must add them like so:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ This could take some time depending on your internet connection.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1. From the project directory, run this command to get inside the docker
- ```bash
- docker-compose exec wordcamp.test bash
- ```
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. `/wp-admin` pages for these sites should now be accessible. Use `admin` as username and `password` as password to login. Front end pages will not be accessible until you complete the remaining steps.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1. Run predefined command for installing plugins and themes. This could take some time depending on your internet connection:
- ```bash
- sh install-plugin-theme.sh
- ```
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ If your browser warns you about the self-signed certificates, then the CA certificate is not properly installed. For Chrome, [manually add the CA cert to Keychain Access](https://deliciousbrains.com/ssl-certificate-authority-for-local-https-development/). For Firefox, import it to `Preferences > Certificates > Advanced > Authorities`.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. By default, docker will start with data defined in `.docker/wordcamp_dev.sql` and changes to data will be persisted across runs in `.docker/database`. To start with different database, delete `.docker/database` directory and replace the `.docker/wordcamp_dev.sql` file and run `docker-compose up --build -d` again.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. Note that if you want to work on WordCamp blocks, [you would have to install all the node dependencies](../public_html/wp-content/mu-plugins/blocks/readme.md). This can be done either inside, or even from outside the Docker.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#### Useful Docker Commands:
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+## Useful Docker Commands:
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Note: All of these commands are meant to be executed from project directory.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. To start WordCamp docker containers, use:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,31 +78,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> here `-d` flags directs docker to run in background.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. To view `nginx` and `php-logs` use:
- ```bash
- docker-compose logs -f --tail=100 wordcamp.test
- ```
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ todo why does it do so much stuff when booting? shouldn't reprovision stuff, just boot. provision should be seprate process like vvv, otherwise slow
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- here
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. To stop the running docker containers, use the command like so:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `-f` flag is used for consistently following the logs. Omit this to only dump the logs in terminal.
-
- `--tail=100` flag is used to view only last `100` lines of log. Omit this if you'd like to see the entire log since docker started.
-
- `wordcamp.test` is the name of the docker service which is running `nginx` and `php`
-
- Similarly, to view MySQL server logs (note: this does not show MySQL queries made by application, these are just server logs), use:
-
</del><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- docker-compose logs -f --tail=100 wordcamp.db
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ docker-compose stop
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- here
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. To open a shell inside the web container, use:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `wordcamp.db` is the name of docker service which is running MySQL server.
-
-1. To execute a command inside docker running `nginx` and `php`, use:
-
</del><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose exec wordcamp.test bash
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> `wordcamp.test` is the name of docker service running `nginx` and `php`
</span><span class="cx" style="display: block; padding: 0 10px"> `bash` is the name of command that we want to execute. This particular command will give us shell access inside the docker.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Similarly, for MySQL, you can use:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Similarly, for the MySQL container, you can use:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose exec wordcamp.db bash
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,11 +105,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> here
</span><span class="cx" style="display: block; padding: 0 10px"> `wordcamp.db` is the name of docker service running MySQL server
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. To stop the running docker containers, use the command like so:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. To view `nginx` and `php-logs` use:
+ ```bash
+ docker-compose logs -f --tail=100 wordcamp.test
+ ```
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ here
+
+ `-f` flag is used for consistently following the logs. Omit this to only dump the logs in terminal.
+
+ `--tail=100` flag is used to view only last `100` lines of log. Omit this if you'd like to see the entire log since docker started.
+
+ `wordcamp.test` is the name of the docker service which is running `nginx` and `php`
+
+ Similarly, to view MySQL server logs (note: this does not show MySQL queries made by application, these are just server logs), use:
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- docker-compose stop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ docker-compose logs -f --tail=100 wordcamp.db
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ here
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `wordcamp.db` is the name of docker service which is running MySQL server.
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Once the Docker instance has started, you can visit [2014.content.wordcamp.org](2014.content.wordcamp.org) to view a sample WordCamp site. WordCamp central would be [central.wordcamp.test](central.wordcamp.test). You can also visit [localhost:1080](localhost:1080) to view the MailCatcher dashboard.
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockerwordcampsslconf"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/.docker/wordcamp.ssl.conf</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/wordcamp.ssl.conf 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/wordcamp.ssl.conf 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,28 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[ req ]
-default_bits = 2048
-prompt = no
-default_md = sha256
-req_extensions = req_ext
-distinguished_name = dn
-default_keyfile = wordcamp.key
-
-[ dn ]
-C = IN
-ST = STATE
-L = Location
-O = WordCamp
-OU = WordCampDev
-CN = wordcamp
-
-[ req_ext ]
-subjectAltName = @alt_names
-
-[ alt_names ]
-DNS.1 = wordcamp.docker
-
-[ v3_ext ]
-authorityKeyIdentifier=keyid,issuer:always
-basicConstraints=CA:FALSE
-keyUsage=keyEncipherment,dataEncipherment
-extendedKeyUsage=serverAuth,clientAuth
-subjectAltName=@alt_names%
</del></span></pre></div>
<a id="sitestrunkwordcamporgdockerwpconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.docker/wp-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.docker/wp-config.php 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.docker/wp-config.php 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,14 +24,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set( 'display_errors', 'On' );
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set( 'error_reporting', E_ALL );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**#@+
- * Authentication Unique Keys and Salts.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
- * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
- *
- * @since 2.6.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * It doesn't matter for local environments, but use `wp config shuffle-salts` to change this in production
+ * environments, because generating the keys locally is safer than using the API (and exposing the keys to
+ * your OS/browser if you copy/paste, etc).
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'AUTH_KEY', 'put your unique phrase here' );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SECURE_AUTH_KEY', 'put your unique phrase here' );
</span></span></pre></div>
<a id="sitestrunkwordcamporggitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/.gitignore 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/.gitignore 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .docker/data/
</span><span class="cx" style="display: block; padding: 0 10px"> .docker/database
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.docker/wordcamp*.pem
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public_html/wp-content/mu-plugins/blocks/build
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgdockercomposeyaml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/docker-compose.yaml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/docker-compose.yaml 2019-06-24 23:55:24 UTC (rev 8990)
+++ sites/trunk/wordcamp.org/docker-compose.yaml 2019-06-25 20:47:09 UTC (rev 8991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> version: "3.2"
</span><span class="cx" style="display: block; padding: 0 10px"> services:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # todo indent w/ 4 spaces for readability. yaml doesn't allow tabs
</ins><span class="cx" style="display: block; padding: 0 10px"> wordcamp.test:
</span><span class="cx" style="display: block; padding: 0 10px"> build:
</span><span class="cx" style="display: block; padding: 0 10px"> context: .docker
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +8,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><span class="cx" style="display: block; padding: 0 10px"> - "./public_html/wp-content:/usr/src/public_html/wp-content"
</span><span class="cx" style="display: block; padding: 0 10px"> - ".docker/wp-config.php:/usr/src/public_html/wp-config.php"
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # todo should mount nginx.conf, php-form.conf, install-plugin-theme.sh, etc too? then could edit and re-run rather than having to copy and rebuild
+ # todo mount host ~/dotfiles into container /root, but can't b/c outside .docker folder?
</ins><span class="cx" style="display: block; padding: 0 10px"> ports:
</span><span class="cx" style="display: block; padding: 0 10px"> - "80:80"
</span><span class="cx" style="display: block; padding: 0 10px"> - "443:443"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,12 +20,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> nginx &&
</span><span class="cx" style="display: block; padding: 0 10px"> mailcatcher --http-ip 0.0.0.0 &&
</span><span class="cx" style="display: block; padding: 0 10px"> php-fpm"
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # todo configure entrypoint to work around annoying wp-cli allow-root problem -- https://github.com/wp-cli/wp-cli/issues/1838#issuecomment-434077907
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wordcamp.db:
</span><span class="cx" style="display: block; padding: 0 10px"> build:
</span><span class="cx" style="display: block; padding: 0 10px"> context: .docker
</span><span class="cx" style="display: block; padding: 0 10px"> dockerfile: mysql.Dockerfile
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # todo rename ^ to Dockerfile.mysql and the other to Dockerfile.webhead or something, for clarity. maybe also rename `wordcamp.db` to something more correct.
</ins><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><span class="cx" style="display: block; padding: 0 10px"> - ".docker/database:/var/lib/mysql"
</span><span class="cx" style="display: block; padding: 0 10px"> ports:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # todo document that 3307 to avoid conflicts w/ host mysql server?
</ins><span class="cx" style="display: block; padding: 0 10px"> - "3307:3306"
</span></span></pre>
</div>
</div>
</body>
</html>