Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12205


Change subject: cosmetic: gerrit: use variables for the files to patch
......................................................................

cosmetic: gerrit: use variables for the files to patch

Make the code more readable, and make it easier to update the paths
if they should change again.

Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771
---
M gerrit/Dockerfile
1 file changed, 9 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/12205/1

diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 9edae12..98599f0 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -3,16 +3,21 @@
 USER root
 RUN yum -y install zip unzip patch
 
+# Patch LoginForm.html (unpack and repack from gerrit.war)
+ARG gerritwar="/var/gerrit/bin/gerrit.war"
+ARG libopenid="WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar"
+ARG loginform="com/google/gerrit/httpd/auth/openid/LoginForm.html"
+
 RUN \
-	unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \
-	unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html
+	unzip "$gerritwar" "$libopenid" && \
+	unzip "$libopenid" "$loginform"
 
 COPY add_osmocom.diff /tmp
 RUN patch -p0 < /tmp/add_osmocom.diff
 
 RUN \
-	zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \
-	zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar
+	zip -u "$libopenid" "$loginform" && \
+	zip -u "$gerritwar" "$libopenid"
 
 USER gerrit
 

-- 
To view, visit https://gerrit.osmocom.org/12205
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771
Gerrit-Change-Number: 12205
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181207/3a464d78/attachment.htm>