<!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>[8825] sites/trunk/wordcamp.org/.docker: WC Docker: Move WordPress files to `./mu` to match production.</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/8825">8825</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/8825","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-20 11:53:05 +0000 (Mon, 20 May 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'>WC Docker: Move WordPress files to `./mu` to match production.
In production environment, we have WordPress files in `public_html/mu` directory, so it makes sense to have them in same location in Docker environment as well.
This also required config change in `nginx` so that static files in `wp-content` are served properly given that root is changed.
This patch also has a minor fixup of http->https.</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="#sitestrunkwordcamporgdockerwpconfigphp">sites/trunk/wordcamp.org/.docker/wp-config.php</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-05-20 11:52:58 UTC (rev 8824)
+++ sites/trunk/wordcamp.org/.docker/Dockerfile 2019-05-20 11:53:05 UTC (rev 8825)
</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"> FROM wordpress:5.0.3-fpm
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Move WordPress files to Working Directory
-RUN mv /usr/src/wordpress /usr/src/public_html
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# We store files in `mu` directory to make it consistent with production.
+RUN mkdir -p /usr/src/public_html/mu/ && mv /usr/src/wordpress/* /usr/src/public_html/mu
</ins><span class="cx" style="display: block; padding: 0 10px"> WORKDIR /usr/src/public_html
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Install and configure nginx
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install libxext6 -y
</span><span class="cx" style="display: block; padding: 0 10px"> RUN tar xvf wkhtmltox.tar.xz
</span><span class="cx" style="display: block; padding: 0 10px"> RUN mv wkhtmltox/bin/wkhtmlto* /usr/bin/
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+RUN rm -rf wkhtmltox*
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Install WP-CLI
</span><span class="cx" style="display: block; padding: 0 10px"> RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> RUN chmod +x wp-cli.phar
</span><span class="cx" style="display: block; padding: 0 10px"> RUN mv wp-cli.phar /usr/local/bin/wp
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install less -y
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+COPY wp-cli.yml /usr/src/public_html/wp-cli.yml
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Install MailCatcher.
</span><span class="cx" style="display: block; padding: 0 10px"> RUN apt-get install build-essential libsqlite3-dev ruby-dev -y
</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-05-20 11:52:58 UTC (rev 8824)
+++ sites/trunk/wordcamp.org/.docker/nginx.conf 2019-05-20 11:53:05 UTC (rev 8825)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ssl_certificate_key /etc/ssl/private/wordcamp.key;
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- root /usr/src/public_html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ root /usr/src/public_html/mu;
</ins><span class="cx" style="display: block; padding: 0 10px"> index index.php;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> location = /favicon.ico {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fastcgi_pass php;
</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">+ 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"> location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
</span><span class="cx" style="display: block; padding: 0 10px"> expires max;
</span><span class="cx" style="display: block; padding: 0 10px"> log_not_found off;
</span></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-05-20 11:52:58 UTC (rev 8824)
+++ sites/trunk/wordcamp.org/.docker/wp-config.php 2019-05-20 11:53:05 UTC (rev 8825)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,13 +94,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_CONTENT_DIR', dirname( __FILE__ ) . '/wp-content' );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'FORCE_SSL_ADMIN', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WP_CONTENT_URL', 'http://' . preg_replace( '/[^-_.0-9a-z:]/i', '', $_SERVER['HTTP_HOST'] ) . '/wp-content' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WP_CONTENT_URL', 'https://' . preg_replace( '/[^-_.0-9a-z:]/i', '', $_SERVER['HTTP_HOST'] ) . '/wp-content' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once(ABSPATH . 'wp-settings.php');
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* That's all, stop editing! Happy blogging. */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Absolute path to the WordPress directory. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined('ABSPATH') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'ABSPATH', dirname( __FILE__ ) . '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'ABSPATH', dirname( __FILE__ ) . '/mu' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( ABSPATH . 'wp-settings.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>