<p>Follow up to Tom’s review comments in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="510873817" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/2409" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/2409/hovercard?comment_id=582662631&comment_type=review" href="https://github.com/openstreetmap/openstreetmap-website/pull/2409#pullrequestreview-582662631">#2409 (review)</a>:</p>
<ul>
<li>Checkout was updated to v2 upstream, so no need to do that in this PR</li>
<li>Bootsnap conditional in <code>config/boot.rb</code> appears to be necessary for this image to work under an Ubuntu image. Based on conversation in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="510873817" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/2409" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/2409/hovercard?comment_id=549471542&comment_type=review_comment" href="https://github.com/openstreetmap/openstreetmap-website/pull/2409#discussion_r549471542">#2409 (comment)</a>, I don’t think we can remove this</li>
<li>Moved DB functions to <code>/usr/local/share/</code> since they’re still necessary per <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="510873817" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/2409" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/2409/hovercard?comment_id=570115583&comment_type=review_comment" href="https://github.com/openstreetmap/openstreetmap-website/pull/2409#discussion_r570115583">#2409 (comment)</a></li>
<li>DB password and superuser privilege are both still needed when even when using trust auth because the database is needed for setup, migrations, normal usage, and data imports</li>
<li><code>yarnpkg install</code> is still required since <code>bundle exec</code> will not work without additional app code present during Docker build step. The old option here was to leave the yarn step for the end-user after app installation, but I think it’s better more of the build process to be automated within the Dockerfile</li>
</ul>
<p><span class="issue-keyword tooltipped tooltipped-se" aria-label="This pull request closes issue #3081.">Closes</span> <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="800626698" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/3081" data-hovercard-type="issue" data-hovercard-url="/openstreetmap/openstreetmap-website/issues/3081/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/issues/3081">#3081</a></p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3083'>https://github.com/openstreetmap/openstreetmap-website/pull/3083</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Moved osm-db-functions.sql to /usr/local/share/</li>
  <li>Added note about password and privileges for OSM DB user</li>
  <li>Added explanatory notes and comments</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3083/files#diff-972512ed94fce217ace10a2303390c321d822f967f2f008c353fb5f57152b7d0">DOCKER.md</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3083/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557">Dockerfile</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3083/files#diff-bd8bda025306c9c437bac4a1a71d22019525ce2c43a43ddd39dfb796e9339834">docker/postgres/Dockerfile</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3083/files#diff-b71ed5c9e0bf1004606be9f68c61c8fc1b2aaa7e5fd333fad6246bc59bed66ce">docker/postgres/openstreetmap-postgres-init.sh</a>
    (3)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3083.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3083.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3083.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3083.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3083">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI6ZYHK5JC5ZUBILKLS5LITZANCNFSM4XDGTICA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AAK2OLLR4KURGXJRCQ4LU3LS5LITZA5CNFSM4XDGTICKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4L6FTE6A.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3083",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3083",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>