From b6ad85bd4cec4a8865a0ec88c2b26a37c13c83a7 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 7 Dec 2018 15:55:44 +0100 Subject: [PATCH] gerrit: fix libopenid path Update the path to libopenid.jar, to fix the following error and make the container build again. This change is necessary, because we are patching a file inside "gerrit.war", and the path to that file has been changed upstream. Step 4/8 : RUN unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar ... ---> Running in 815585d87fdd Archive: /var/gerrit/bin/gerrit.war caution: filename not matched: WEB-INF/lib/gerrit-openid-libopenid.jar Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 --- gerrit/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index e67c7600..9edae124 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -4,15 +4,15 @@ USER root RUN yum -y install zip unzip patch RUN \ - unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar && \ - unzip WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html + 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 COPY add_osmocom.diff /tmp RUN patch -p0 < /tmp/add_osmocom.diff RUN \ - zip -u WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ - zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar + 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 USER gerrit