Change in docker-playground[master]: gerrit: fix libopenid path

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Fri Dec 7 15:18:14 UTC 2018


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


Change subject: gerrit: fix libopenid path
......................................................................

gerrit: fix libopenid path

Update the path to libopenid.jar, to fix the following error and make
the container build again.

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
---
M gerrit/Dockerfile
1 file changed, 4 insertions(+), 4 deletions(-)



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

diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index e67c760..9edae12 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -4,15 +4,15 @@
 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
 

-- 
To view, visit https://gerrit.osmocom.org/12204
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: Iaed2429a776ae587043dc2651293bb354fceeb72
Gerrit-Change-Number: 12204
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/34158cb5/attachment.htm>


More information about the gerrit-log mailing list