gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-22 08:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix work issues for PHP 7.0 and 7.1

Browse Source
This commit is contained in:
cytopia
2021-05-16 17:04:11 +02:00
parent 712ad5c66a
commit a6e27c1dcd
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfiles/work/Dockerfile-7.0
View File

@@ -213,10 +213,19 @@ RUN set -eux \
&& rm -rf /usr/local/src/drush8/misc \ && rm -rf /usr/local/src/drush8/misc \
\ \
\ \
# -------------------- drupalconsole -------------------- # -------------------- drush9 --------------------
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \ && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && cd /usr/local/src/drush9 \
&& chmod +x /usr/local/bin/drupal \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
\
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \
&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
&& rm -rf /usr/local/src/drush9/.git \
&& rm -rf /usr/local/src/drush9/docs \
&& rm -rf /usr/local/src/drush9/examples \
&& rm -rf /usr/local/src/drush9/misc \
\
\ \
# -------------------- gitflow -------------------- # -------------------- gitflow --------------------
&& git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \
@@ -557,7 +566,7 @@ RUN set -eux \
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
&& drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \
&& drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \
&& drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \
&& git-flow version | grep -E '[0-9][.0-9]+' \ && git-flow version | grep -E '[0-9][.0-9]+' \
&& laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \

19
Dockerfiles/work/Dockerfile-7.1
View File

@@ -212,10 +212,19 @@ RUN set -eux \
&& rm -rf /usr/local/src/drush8/misc \ && rm -rf /usr/local/src/drush8/misc \
\ \
\ \
# -------------------- drupalconsole -------------------- # -------------------- drush9 --------------------
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \ && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && cd /usr/local/src/drush9 \
&& chmod +x /usr/local/bin/drupal \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
\
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \
&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
&& rm -rf /usr/local/src/drush9/.git \
&& rm -rf /usr/local/src/drush9/docs \
&& rm -rf /usr/local/src/drush9/examples \
&& rm -rf /usr/local/src/drush9/misc \
\
\ \
# -------------------- gitflow -------------------- # -------------------- gitflow --------------------
&& git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \
@@ -556,7 +565,7 @@ RUN set -eux \
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
&& drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \
&& drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \
&& drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \
&& git-flow version | grep -E '[0-9][.0-9]+' \ && git-flow version | grep -E '[0-9][.0-9]+' \
&& laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \

4
build/ansible/group_vars/all/work.yml
View File

@@ -500,7 +500,7 @@ software_available:
&& rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/examples \
&& rm -rf /usr/local/src/drush8/misc \ && rm -rf /usr/local/src/drush8/misc \
drush9: drush9:
disabled: [5.2, 5.3, 5.4, 5.5, 7.0, 7.1, 8.0, 8.1] disabled: [5.2, 5.3, 5.4, 5.5, 8.0, 8.1]
check: drush9 --version | grep -E '9[.0-9]+\s*$' check: drush9 --version | grep -E '9[.0-9]+\s*$'
all: all:
pre: | pre: |
@@ -516,7 +516,7 @@ software_available:
&& rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/examples \
&& rm -rf /usr/local/src/drush9/misc \ && rm -rf /usr/local/src/drush9/misc \
drupalconsole: drupalconsole:
disabled: [5.2, 5.3, 5.4, 8.0, 8.1] # TODO: re-enable for 8.0 (currently errors) disabled: [5.2, 5.3, 5.4, 7.0, 7.1, 8.0, 8.1] # TODO: re-enable for 8.0 (currently errors)
check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]'
5.5: 5.5:
pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"