From de5de84eb4656a286d1010742a8bd8196e90e55b Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 4 Oct 2022 20:16:44 -0400 Subject: [PATCH] switch to git clone --- Dockerfile | 17 ++++++----------- Dockerfile.aarch64 | 17 ++++++----------- Dockerfile.armhf | 17 ++++++----------- Jenkinsfile | 2 +- README.md | 2 +- readme-vars.yml | 2 +- 6 files changed, 21 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index 989eff3..c1c6eff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,23 +39,18 @@ RUN \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ echo "**** install lychee ****" && \ - mkdir -p /app/www && \ - if [ -z ${LYCHEE_VERSION} ]; then \ + if [ -z "${LYCHEE_VERSION}" ]; then \ LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - curl -o \ - /tmp/lychee.tar.gz -L \ - "https://github.com/LycheeOrg/Lychee/archive/${LYCHEE_VERSION}.tar.gz" && \ - tar xf \ - /tmp/lychee.tar.gz -C \ - /app/www/ --strip-components=1 && \ - cd /app/www && \ + mkdir /app/lychee && \ + git clone --recurse-submodules https://github.com/LycheeOrg/Lychee.git /app/lychee && \ + cd /app/lychee && \ + git checkout "${LYCHEE_VERSION}" && \ echo "**** install composer dependencies ****" && \ composer install \ - -d /app/www \ + -d /app/lychee \ --no-dev \ - --no-suggest \ --no-interaction && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a97abc9..c860838 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -39,23 +39,18 @@ RUN \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ echo "**** install lychee ****" && \ - mkdir -p /app/www && \ - if [ -z ${LYCHEE_VERSION} ]; then \ + if [ -z "${LYCHEE_VERSION}" ]; then \ LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - curl -o \ - /tmp/lychee.tar.gz -L \ - "https://github.com/LycheeOrg/Lychee/archive/${LYCHEE_VERSION}.tar.gz" && \ - tar xf \ - /tmp/lychee.tar.gz -C \ - /app/www/ --strip-components=1 && \ - cd /app/www && \ + mkdir /app/lychee && \ + git clone --recurse-submodules https://github.com/LycheeOrg/Lychee.git /app/lychee && \ + cd /app/lychee && \ + git checkout "${LYCHEE_VERSION}" && \ echo "**** install composer dependencies ****" && \ composer install \ - -d /app/www \ + -d /app/lychee \ --no-dev \ - --no-suggest \ --no-interaction && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8d4598f..225ac9d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -39,23 +39,18 @@ RUN \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ echo "**** install lychee ****" && \ - mkdir -p /app/www && \ - if [ -z ${LYCHEE_VERSION} ]; then \ + if [ -z "${LYCHEE_VERSION}" ]; then \ LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - curl -o \ - /tmp/lychee.tar.gz -L \ - "https://github.com/LycheeOrg/Lychee/archive/${LYCHEE_VERSION}.tar.gz" && \ - tar xf \ - /tmp/lychee.tar.gz -C \ - /app/www/ --strip-components=1 && \ - cd /app/www && \ + mkdir /app/lychee && \ + git clone --recurse-submodules https://github.com/LycheeOrg/Lychee.git /app/lychee && \ + cd /app/lychee && \ + git checkout "${LYCHEE_VERSION}" && \ echo "**** install composer dependencies ****" && \ composer install \ - -d /app/www \ + -d /app/lychee \ --no-dev \ - --no-suggest \ --no-interaction && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Jenkinsfile b/Jenkinsfile index b872897..f8095dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } diff --git a/README.md b/README.md index 8a71ddb..4c33177 100644 --- a/README.md +++ b/README.md @@ -260,7 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). +* **04.10.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). Switch to git clone as builds fail with the release artifact. * **13.05.21:** - Make readme clearer. * **18.04.21:** - Add php-intl for v4.3. * **31.01.21:** - Add jpegoptim. diff --git a/readme-vars.yml b/readme-vars.yml index d02f984..342f2e4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -88,7 +88,7 @@ app_setup_block: | # changelog changelogs: - - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } + - { date: "04.10.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). Switch to git clone as builds fail with the release artifact." } - { date: "13.05.21:", desc: "Make readme clearer." } - { date: "18.04.21:", desc: "Add php-intl for v4.3." } - { date: "31.01.21:", desc: "Add jpegoptim." }