<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12205">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  osmith: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: gerrit: use variables for the files to patch<br><br>Make the code more readable, and make it easier to update the paths<br>if they should change again.<br><br>Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771<br>---<br>M gerrit/Dockerfile<br>1 file changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile</span><br><span>index 9edae12..98599f0 100644</span><br><span>--- a/gerrit/Dockerfile</span><br><span>+++ b/gerrit/Dockerfile</span><br><span>@@ -3,16 +3,21 @@</span><br><span> USER root</span><br><span> RUN yum -y install zip unzip patch</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Patch LoginForm.html (unpack and repack from gerrit.war)</span><br><span style="color: hsl(120, 100%, 40%);">+ARG gerritwar="/var/gerrit/bin/gerrit.war"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG libopenid="WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG loginform="com/google/gerrit/httpd/auth/openid/LoginForm.html"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN \</span><br><span style="color: hsl(0, 100%, 40%);">- unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \</span><br><span style="color: hsl(0, 100%, 40%);">-     unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html</span><br><span style="color: hsl(120, 100%, 40%);">+        unzip "$gerritwar" "$libopenid" && \</span><br><span style="color: hsl(120, 100%, 40%);">+      unzip "$libopenid" "$loginform"</span><br><span> </span><br><span> COPY add_osmocom.diff /tmp</span><br><span> RUN patch -p0 < /tmp/add_osmocom.diff</span><br><span> </span><br><span> RUN \</span><br><span style="color: hsl(0, 100%, 40%);">-  zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \</span><br><span style="color: hsl(0, 100%, 40%);">-    zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar</span><br><span style="color: hsl(120, 100%, 40%);">+       zip -u "$libopenid" "$loginform" && \</span><br><span style="color: hsl(120, 100%, 40%);">+     zip -u "$gerritwar" "$libopenid"</span><br><span> </span><br><span> USER gerrit</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12205">change 12205</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12205"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 </div>
<div style="display:none"> Gerrit-Change-Number: 12205 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>