switch to git clone

This commit is contained in:
aptalca 2022-10-04 20:16:44 -04:00
parent 78c2e9b729
commit de5de84eb4
6 changed files with 21 additions and 36 deletions

View File

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

View File

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

View File

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

2
Jenkinsfile vendored
View File

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

View File

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

View File

@ -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." }