osmith has submitted this change and it was merged. ( 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(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Verified 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: merged Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <[email protected]> Gerrit-Reviewer: Harald Welte <[email protected]> Gerrit-Reviewer: Pau Espin Pedrol <[email protected]> Gerrit-Reviewer: osmith <[email protected]>
