diff --git a/Dockerfile b/Dockerfile index 4ef6e38..bfcd12c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ ARG GROCY_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips, homerr" -##FIXME: Once PHP 7.4 is integrated, remove the sed statements for composer! RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -39,8 +38,6 @@ RUN \ cp -R /app/grocy/data/plugins \ /defaults/plugins && \ echo "**** install composer packages ****" && \ - sed -i 's/[[:blank:]]*"php": ">=7.4",/"php": ">=7.3",/g' /app/grocy/composer.json && \ - sed -i 's/[[:blank:]]*"php": ">=7.4"/"php": ">=7.3"/g' /app/grocy/composer.lock && \ composer install -d /app/grocy --no-dev && \ echo "**** install yarn packages ****" && \ cd /app/grocy && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 639d844..e7b7d4d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,7 +7,6 @@ ARG GROCY_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips, homerr" -##FIXME: Once PHP 7.4 is integrated, remove the sed statements for composer! RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -39,8 +38,6 @@ RUN \ cp -R /app/grocy/data/plugins \ /defaults/plugins && \ echo "**** install composer packages ****" && \ - sed -i 's/[[:blank:]]*"php": ">=7.4",/"php": ">=7.3",/g' /app/grocy/composer.json && \ - sed -i 's/[[:blank:]]*"php": ">=7.4"/"php": ">=7.3"/g' /app/grocy/composer.lock && \ composer install -d /app/grocy --no-dev && \ echo "**** install yarn packages ****" && \ cd /app/grocy && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1385d9b..1cd4956 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -7,7 +7,6 @@ ARG GROCY_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips, homerr" -##FIXME: Once PHP 7.4 is integrated, remove the sed statements for composer! RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -39,8 +38,6 @@ RUN \ cp -R /app/grocy/data/plugins \ /defaults/plugins && \ echo "**** install composer packages ****" && \ - sed -i 's/[[:blank:]]*"php": ">=7.4",/"php": ">=7.3",/g' /app/grocy/composer.json && \ - sed -i 's/[[:blank:]]*"php": ">=7.4"/"php": ">=7.3"/g' /app/grocy/composer.lock && \ composer install -d /app/grocy --no-dev && \ echo "**** install yarn packages ****" && \ cd /app/grocy && \