Skip to content

Commit

Permalink
Merge pull request #36 from Forceu/master
Browse files Browse the repository at this point in the history 
Remove hotfix for PHP7.3
  • Loading branch information
@Roxedus
Roxedus authored Feb 17, 2021
2 parents 85a6b13 + 09bde84 commit 64f82fd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down

0 comments on commit 64f82fd

Please sign in to comment.