osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Oliver Smith 2018-12-07 15:55:44 +01:00 committed by osmith
parent 317ca49155
commit b6ad85bd4c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit/Dockerfile
View File

@ -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