- upstream

Wolvverine · May 21, 2021 · fe9937f · fe9937f
1 parent 23d935a
commit fe9937f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ env:
     - secure: 'QhiF7/Zi7E2gAuW7p8ondB/cMS5dE3Hd1356bugZgC6Tpftp5MFEgmk2ecDwJG1mvDjie8+WCdBSm7a0dumFqsUwgtO7OkHhIj3v1QZTyH1LOFNlud2Yb7r0ed6JXYte8nnmAet1sxawHB3Il6euiM7eg8FjRuB24o3PH9SUzy9xNuerhYugpS0S94EyIzEpscpyJc2c6KIkANNIKMvwf2wm3uVBQJyEwZvEjT37C97vJaBi72G/m9xKl8MfsnGmThOn4jX8kmdPue8fDtCIu2DxvfW7eEWpAKAbQf35xV8fPLrLNCjhUSimPag4YpqvWhuIqT8bBS2dyZRS57D0PV3SMKrHASUUlkd+E0p8/wkWVv4w9scOcVuKwpAL0Z3MSBtk5AXswn2smweYjgQbNQPBjcN7aVNEmZMUxKu5DXyJy5WrhyZqwmyygraWV5SP7U5spBdvs70VSWfxtgQsq1F842tus768fNEffGobcVlnrfkWkZuj1YezqeTx3skPnonCBRDVaHb/zmD9OEP2+PiDEQseKB5VBv95ZmByeSg3QtCtpZFW+wyVI75JuMki9B/6MUkJ0rPRX9Tf7cDrUXGXfywN15DDP//4i+Fb+iZLxsoMQ0/gp5oMMh4ygf7h6SJbWa7Ve4atH27gVojAYYoaVRGkgyRslf5UiYWepLk='
   matrix:
     # Provide a list of GLPI version to build
-    - GLPI_VERSION=9.5.5 IMAGE_VARIANT=nginx-72 UPDATE_README=1
-    # - GLPI_VERSION=9.4.6 IMAGE_VARIANT=nginx-56
+    - GLPI_VERSION=9.5.5 IMAGE_VARIANT=nginx-72 UPDATE_README=1 UPDATE_LATEST=1
+    - GLPI_VERSION=9.5.4 IMAGE_VARIANT=nginx-72
 
 before_install:
     - sudo apt update

diff --git a/Dockerfile_nginx-72 b/Dockerfile_nginx-72
@@ -10,7 +10,7 @@ RUN curl -v --fail -o glpi.tgz -L "https://github.com/glpi-project/glpi/releases
 
 WORKDIR "${GLPI_PATHS_ROOT}"
 
-RUN curl --fail --remote-name-all \
+RUN curl --silent --show-error --fail --remote-name-all \
       https://raw.githubusercontent.com/glpi-project/glpi/${GLPI_VERSION}/composer.json \
       https://raw.githubusercontent.com/glpi-project/glpi/${GLPI_VERSION}/composer.lock \
     && COMPOSER_HOME=/tmp/composer composer require \
@@ -25,7 +25,7 @@ RUN curl --fail --remote-name-all \
       --update-no-dev \
       --working-dir ${GLPI_PATHS_ROOT} \
       apereo/phpcas \
-    && rm -fv composer.json composer.lock
+    && rm -fv composer.json 
 
 # Second stage : build final image
 FROM php:7.2-fpm-alpine3.11
@@ -125,7 +125,7 @@ COPY root/ /
 COPY /docker-entrypoint.sh /
 COPY /docker-entrypoint.d/* /docker-entrypoint.d/
 
-RUN chmod -R +x /docker-entrypoint.d/ \
+RUN chmod -R +x /docker-entrypoint.d/ /usr/local/bin/cronwrapper.py \
     && chmod -R g=rX,o=--- /var/www/* \
     && addgroup nginx www-data