<!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>[8989] sites/trunk/wordcamp.org/.docker: WordCamp Docker: Apply coding stanards.</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/8989">8989</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/8989","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-24 19:22:10 +0000 (Mon, 24 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: Apply coding stanards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgdockerDockerfile">sites/trunk/wordcamp.org/.docker/Dockerfile</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>
</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 19:22:05 UTC (rev 8988)
+++ sites/trunk/wordcamp.org/.docker/Dockerfile 2019-06-24 19:22:10 UTC (rev 8989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,5 +112,3 @@
</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 class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> CMD tail -f /dev/null
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
</del></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 19:22:05 UTC (rev 8988)
+++ sites/trunk/wordcamp.org/.docker/nginx.conf 2019-06-24 19:22:10 UTC (rev 8989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Upstream to abstract backend connection(s) for PHP
</span><span class="cx" style="display: block; padding: 0 10px"> upstream php {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- server unix:/tmp/php-cgi.socket;
- server 127.0.0.1:9000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ server unix:/tmp/php-cgi.socket;
+ server 127.0.0.1:9000;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> server {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,46 +12,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> server {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- listen 443 ssl http2;
- listen [::]:443 ssl http2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- server_name wordcamp.test;
- ssl_certificate /etc/ssl/certs/wordcamp.crt;
- ssl_certificate_key /etc/ssl/private/wordcamp.key;
- ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ server_name wordcamp.test;
+ ssl_certificate /etc/ssl/certs/wordcamp.crt;
+ ssl_certificate_key /etc/ssl/private/wordcamp.key;
+ ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- root /usr/src/public_html/mu;
- index index.php;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ root /usr/src/public_html/mu;
+ index index.php;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location = /favicon.ico {
- log_not_found off;
- access_log off;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location = /favicon.ico {
+ log_not_found off;
+ access_log off;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location = /robots.txt {
- allow all;
- log_not_found off;
- access_log off;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location / {
- try_files $uri $uri/ /index.php?$args;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location / {
+ try_files $uri $uri/ /index.php?$args;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location ~ \.php$ {
- include fastcgi.conf;
- fastcgi_intercept_errors on;
- fastcgi_pass php;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location ~ \.php$ {
+ include fastcgi.conf;
+ fastcgi_intercept_errors on;
+ fastcgi_pass php;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location ~* /wp-content/.*\.(js|css|png|jpg|jpeg|gif|ico)$ {
- root /usr/src/public_html;
- expires max;
- log_not_found off;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location ~* /wp-content/.*\.(js|css|png|jpg|jpeg|gif|ico)$ {
+ root /usr/src/public_html;
+ expires max;
+ log_not_found off;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
- expires max;
- log_not_found off;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+ expires max;
+ log_not_found off;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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 19:22:05 UTC (rev 8988)
+++ sites/trunk/wordcamp.org/.docker/readme.md 2019-06-24 19:22:10 UTC (rev 8989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-1. Clone the repo:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+1. Clone the repo:
</ins><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="cx" style="display: block; padding: 0 10px"> git clone git@github.com:WordPress/wordcamp.org.git
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,11 +27,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 127.0.0.1 2014.misc.wordcamp.test
</span><span class="cx" style="display: block; padding: 0 10px"> 127.0.0.1 2014.new-site.wordcamp.test
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 1. The installation doesn't have any 3rd-party plugins or themes yet, you must add them like so:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. From the project directory, run this command to get inside the docker
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</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.test bash
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 1. Run predefined command for installing plugins and themes. This could take some time depending on your internet connection:
</span><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> sh install-plugin-theme.sh
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,30 +56,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose up -d
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> here `-d` flags directs docker to run in background.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 1. To view `nginx` and `php-logs` use:
</span><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose logs -f --tail=100 wordcamp.test
</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">+
+ here
+
</ins><span class="cx" style="display: block; padding: 0 10px"> `-f` flag is used for consistently following the logs. Omit this to only dump the logs in terminal.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- `--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.
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ `--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.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> `wordcamp.test` is the name of the docker service which is running `nginx` and `php`
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> Similarly, to view MySQL server logs (note: this does not show MySQL queries made by application, these are just server logs), use:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose logs -f --tail=100 wordcamp.db
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> here
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> `wordcamp.db` is the name of docker service which is running MySQL server.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 1. To execute a command inside docker running `nginx` and `php`, use:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,25 +87,25 @@
</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.test bash
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> here
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> Similarly, for MySQL, you can use:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 1. To stop the running docker containers, use the command like so:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> ```bash
</span><span class="cx" style="display: block; padding: 0 10px"> docker-compose stop
</span><span class="cx" style="display: block; padding: 0 10px"> ```
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+
</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>
</div>
</body>
</html>