aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-12-07 15:55:44 +0100
committerosmith <osmith@sysmocom.de>2018-12-11 09:13:31 +0000
commitb6ad85bd4cec4a8865a0ec88c2b26a37c13c83a7 (patch)
treedb6da35406f6475b042ac2f060b6264433e0b948
parent317ca4915530fb5f56eb31032d72afc683ac1a20 (diff)
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
-rw-r--r--gerrit/Dockerfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index e67c760..9edae12 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