<!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>[55353] U trunk/.devcontainer/setup.sh: Build/Test Tools: Improve devcontainer setup for non-Codespaces usage</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="https://core.trac.wordpress.org/changeset/55353">55353</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55353","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-16 03:48:26 +0000 (Thu, 16 Feb 2023)</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'>Build/Test Tools: Improve devcontainer setup for non-Codespaces usage
This now runs in local Docker as well. Sets the executable propset to explicitly identify `install-tool.sh` and `setup.sh` as executable. Unclear if this will sync via the Git mirror; ideally it would as otherwise the two files show as modified in a Git clone even in a fresh container.
Props samruddhikhandale.
See <a href="https://core.trac.wordpress.org/ticket/57187">#57187</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdevcontainerdevcontainerjson">trunk/.devcontainer/devcontainer.json</a></li>
<li><a href="#trunkdevcontainerdockercomposeyml">trunk/.devcontainer/docker-compose.yml</a></li>
<li><a href="#trunkdevcontainerinstalltoolssh">trunk/.devcontainer/install-tools.sh</a></li>
<li><a href="#trunkdevcontainersetupsh">trunk/.devcontainer/setup.sh</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdevcontainerinstalltoolssh">trunk/.devcontainer/install-tools.sh</a></li>
<li><a href="#trunkdevcontainersetupsh">trunk/.devcontainer/setup.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdevcontainerdevcontainerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.devcontainer/devcontainer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.devcontainer/devcontainer.json 2023-02-16 00:02:21 UTC (rev 55352)
+++ trunk/.devcontainer/devcontainer.json 2023-02-16 03:48:26 UTC (rev 55353)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "WordPress Core Development",
</span><span class="cx" style="display: block; padding: 0 10px"> "dockerComposeFile": "docker-compose.yml",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "service": "wordpress",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "service": "app",
</ins><span class="cx" style="display: block; padding: 0 10px"> "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Features to add to the dev container. More info: https://containers.dev/features.
</span></span></pre></div>
<a id="trunkdevcontainerdockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.devcontainer/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.devcontainer/docker-compose.yml 2023-02-16 00:02:21 UTC (rev 55352)
+++ trunk/.devcontainer/docker-compose.yml 2023-02-16 03:48:26 UTC (rev 55353)
</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"> version: '3.1'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> services:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wordpress:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ app:
</ins><span class="cx" style="display: block; padding: 0 10px"> image: wordpress
</span><span class="cx" style="display: block; padding: 0 10px"> restart: always
</span><span class="cx" style="display: block; padding: 0 10px"> ports:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WORDPRESS_DB_PASSWORD: examplepass
</span><span class="cx" style="display: block; padding: 0 10px"> WORDPRESS_DB_NAME: exampledb
</span><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - ../src:/var/www/html
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - ../..:/workspaces:cached
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> db:
</span><span class="cx" style="display: block; padding: 0 10px"> image: mariadb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restart: always
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restart: unless-stopped
</ins><span class="cx" style="display: block; padding: 0 10px"> environment:
</span><span class="cx" style="display: block; padding: 0 10px"> MYSQL_DATABASE: exampledb
</span><span class="cx" style="display: block; padding: 0 10px"> MYSQL_USER: exampleuser
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,5 +26,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - db:/var/lib/mysql
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wordpress:
</del><span class="cx" style="display: block; padding: 0 10px"> db:
</span></span></pre></div>
<a id="trunkdevcontainerinstalltoolssh"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.devcontainer/install-tools.sh</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.devcontainer/install-tools.sh 2023-02-16 00:02:21 UTC (rev 55352)
+++ trunk/.devcontainer/install-tools.sh 2023-02-16 03:48:26 UTC (rev 55353)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,5 +7,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sudo chmod +x wp-cli.phar
</span><span class="cx" style="display: block; padding: 0 10px"> sudo mv wp-cli.phar /usr/local/bin/wp
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+echo "Installing chromium..."
+sudo apt-get update
+sudo apt-get -y install --no-install-recommends chromium
+
</ins><span class="cx" style="display: block; padding: 0 10px"> # Copy the welcome message
</span><span class="cx" style="display: block; padding: 0 10px"> sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/.devcontainer/install-tools.sh
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:executable</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+*
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunkdevcontainersetupsh"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.devcontainer/setup.sh</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.devcontainer/setup.sh 2023-02-16 00:02:21 UTC (rev 55352)
+++ trunk/.devcontainer/setup.sh 2023-02-16 03:48:26 UTC (rev 55353)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set -eux
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if [ "${CODESPACE_NAME}" = "" ]; then
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if [ -z ${CODESPACE_NAME+x} ]; then
</ins><span class="cx" style="display: block; padding: 0 10px"> SITE_HOST="http://localhost:8080"
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> SITE_HOST="https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/.devcontainer/setup.sh
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:executable</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+*
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>