Skip to content

Commit

Permalink
Changed devilbox php images to johnea
Browse files Browse the repository at this point in the history
  • Loading branch information
@john-ea
john-ea committed Mar 29, 2024
1 parent 6af0372 commit 6a977b1
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 23 deletions.
5 changes: 3 additions & 2 deletions .tests/scripts/get-modules.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ RETRIES=10
# FUNCTIONS
# -------------------------------------------------------------------------------------------------

PHP_TAG="$( grep 'devilbox/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
PHP_MOD="$( run "curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/doc/php-modules.md'" "${RETRIES}" )";
PHP_TAG="$( grep 'johnea/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
PHP_MOD="$( run "curl -sS 'https://raw.githubusercontent.com/john-ea/docker-php-fpm/${PHP_BRANCH}/doc/php-modules.md'" "${RETRIES}" )";


get_modules() {
Expand Down
6 changes: 3 additions & 3 deletions .tests/scripts/get-tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RETRIES=10
# -------------------------------------------------------------------------------------------------
# FUNCTIONS
# -------------------------------------------------------------------------------------------------

PHP_TAG="$( grep 'devilbox/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
PHP_TOOLS="$( run "curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/doc/available-tools.md'" "${RETRIES}" )";
PHP_TAG="$( grep 'johnea/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
PHP_TOOLS="$( run "curl -sS 'https://raw.githubusercontent.com/john-ea/docker-php-fpm/${PHP_BRANCH}/doc/available-tools.md'" "${RETRIES}" )";

echo "${PHP_TOOLS}" | grep -A 1000000 'TOOLS_WORK_START'
9 changes: 6 additions & 3 deletions .tests/tests/modules-fetch-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ VHOST="${1}"
# The following ensures to download the module test directory

# Where to download from
TEST_REPO="https://github.com/devilbox/docker-php-fpm"
TEST_REPO="https://github.com/john-ea/docker-php-fpm"
TEST_PATH="tests/mods/modules"

# Get current PHP_FPM git tag or branch
PHP_FPM_GIT_SLUG="$( \
grep -E '^[[:space:]]+image:[[:space:]]+devilbox/php-fpm:' "${DVLBOX_PATH}/docker-compose.yml" \
grep -E '^[[:space:]]+image:[[:space:]]+johnea/php-fpm:' "${DVLBOX_PATH}/docker-compose.yml" \
| perl -p -e 's/.*(base|mods|prod|work|)-//g'
)"

Expand All @@ -56,7 +56,10 @@ if [[ ${PHP_FPM_GIT_SLUG} =~ ^[.0-9]+$ ]]; then
else
SVN_PATH="${TEST_REPO}/branches/${PHP_FPM_GIT_SLUG}/${TEST_PATH}"
fi

if [ -z "${PHP_FPM_GIT_SLUG}" ]; then
PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
SVN_PATH="${TEST_REPO}/branches/${PHP_BRANCH}/${TEST_PATH}"
fi
# Cleanup and fetch data
run "docker-compose exec -T --user devilbox php rm -rf /shared/httpd/${VHOST} || true" "${RETRIES}" "${DVLBOX_PATH}"
run "docker-compose exec -T --user devilbox php mkdir -p /shared/httpd/${VHOST}" "${RETRIES}" "${DVLBOX_PATH}"
Expand Down
24 changes: 12 additions & 12 deletions compose/docker-compose.override.yml-php-multi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:

php54:
<<: *default-php
image: devilbox/php-fpm:5.4-prod-0.150
image: devilbox/php-fpm:5.4-prod
hostname: php54
networks:
app_net:
Expand All @@ -52,7 +52,7 @@ services:

php55:
<<: *default-php
image: devilbox/php-fpm:5.5-prod-0.150
image: devilbox/php-fpm:5.5-prod
hostname: php55
networks:
app_net:
Expand All @@ -70,7 +70,7 @@ services:

php56:
<<: *default-php
image: devilbox/php-fpm:5.6-prod-0.150
image: johnea/php-fpm:5.6-prod
hostname: php56
networks:
app_net:
Expand All @@ -88,7 +88,7 @@ services:

php70:
<<: *default-php
image: devilbox/php-fpm:7.0-prod-0.150
image: johnea/php-fpm:7.0-prod
hostname: php70
networks:
app_net:
Expand All @@ -106,7 +106,7 @@ services:

php71:
<<: *default-php
image: devilbox/php-fpm:7.1-prod-0.150
image: johnea/php-fpm:7.1-prod
hostname: php71
networks:
app_net:
Expand All @@ -124,7 +124,7 @@ services:

php72:
<<: *default-php
image: devilbox/php-fpm:7.2-prod-0.150
image: johnea/php-fpm:7.2-prod
hostname: php72
networks:
app_net:
Expand All @@ -142,7 +142,7 @@ services:

php73:
<<: *default-php
image: devilbox/php-fpm:7.3-prod-0.150
image: johnea/php-fpm:7.3-prod
hostname: php73
networks:
app_net:
Expand All @@ -160,7 +160,7 @@ services:

php74:
<<: *default-php
image: devilbox/php-fpm:7.4-prod-0.150
image: johnea/php-fpm:7.4-prod
hostname: php74
networks:
app_net:
Expand All @@ -178,7 +178,7 @@ services:

php80:
<<: *default-php
image: devilbox/php-fpm:8.0-prod-0.150
image: johnea/php-fpm:8.0-prod
hostname: php80
networks:
app_net:
Expand All @@ -196,7 +196,7 @@ services:

php81:
<<: *default-php
image: devilbox/php-fpm:8.1-prod-0.150
image: johnea/php-fpm:8.1-prod
hostname: php81
networks:
app_net:
Expand All @@ -214,7 +214,7 @@ services:

php82:
<<: *default-php
image: devilbox/php-fpm:8.2-prod-0.150
image: johnea/php-fpm:8.2-prod
hostname: php82
networks:
app_net:
Expand All @@ -232,7 +232,7 @@ services:

php83:
<<: *default-php
image: devilbox/php-fpm:8.3-prod-0.150
image: johnea/php-fpm:8.3-prod
hostname: php83
networks:
app_net:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ services:
# PHP
# ------------------------------------------------------------
php:
image: devilbox/php-fpm:${PHP_SERVER}-work-0.151
image: johnea/php-fpm:${PHP_SERVER}-work
hostname: php

##
Expand Down
4 changes: 2 additions & 2 deletions update-docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ fi
### PHP
###
if [ "${WHICH}" = "all" ] || [ "${WHICH}" = "php" ]; then
SUFFIX="$( grep -E '^\s+image:\s+devilbox/php-fpm' "${CWD}/docker-compose.yml" | sed 's/.*}//g' )"
SUFFIX="$( grep -E '^\s+image:\s+johnea/php-fpm' "${CWD}/docker-compose.yml" | sed 's/.*}//g' )"
IMAGES="$( grep -Eo '^#*PHP_SERVER=[.0-9]+' "${CWD}/env-example" | sed 's/.*=//g' )"
echo "${IMAGES}" | while read version ; do
docker pull devilbox/php-fpm:${version}${SUFFIX}
docker pull johnea/php-fpm:${version}${SUFFIX}
done
fi

Expand Down

0 comments on commit 6a977b1

Please sign in to comment.