wpstudio/structure
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* automatic install redis in pecl

Browse Source 
* correct for dot style version notation of php images tagged and pushed into docker hub
This commit is contained in:
dimti
2025-01-15 11:17:10 +03:00
parent 1ea5e96fcb
commit 21140eab2d
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dockerfiles/php/fpm/php.base.Dockerfile
View File

@ -72,7 +72,7 @@ RUN PHP_MAJOR_VERSION=$(php -r 'echo PHP_MAJOR_VERSION;') && \
# Redis: # Redis:
########################################################################### ###########################################################################
RUN pecl install -a redis && \ RUN echo '' | pecl install redis && \
docker-php-ext-enable redis docker-php-ext-enable redis
########################################################################### ###########################################################################

2
src/dockerfiles/php/workspace/workspace.base.Dockerfile
View File

@ -49,7 +49,7 @@ RUN PHP_MAJOR_VERSION=$(php -r 'echo PHP_MAJOR_VERSION;') && \
# Redis: # Redis:
########################################################################### ###########################################################################
RUN pecl install -a redis && \ RUN echo '' | pecl install redis && \
echo "extension=redis.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-redis.ini echo "extension=redis.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-redis.ini
########################################################################### ###########################################################################

21
src/quick/build-php.sh
View File

@ -9,13 +9,20 @@ set -e
ONLY_PUSH=$2 ONLY_PUSH=$2
function dot_version() {
sed -r 's/^([[:digit:]])/\1./g' <<< $1
}
if [ -z "${ONLY_PUSH}" ]; then if [ -z "${ONLY_PUSH}" ]; then
for PHP_VERSION in "${PHP_VERSIONS[@]}"; do for PHP_VERSION in "${PHP_VERSIONS[@]}"; do
PHP_IMAGE=$(dot_version "${PHP_VERSION}")
echo $PHP_IMAGE
docker-compose build "php${PHP_VERSION}" && \ docker-compose build "php${PHP_VERSION}" && \
docker tag "src-php${PHP_VERSION}" "dimti/php:${PHP_VERSION}" docker tag "src-php${PHP_VERSION}" "dimti/php:${PHP_IMAGE}"
docker-compose build "workspace${PHP_VERSION}" && \ docker-compose build "workspace${PHP_VERSION}" && \
docker tag "src-workspace${PHP_VERSION}" "dimti/workspace:${PHP_VERSION}" docker tag "src-workspace${PHP_VERSION}" "dimti/workspace:${PHP_IMAGE}"
done done
fi fi
@ -23,7 +30,13 @@ WITH_PUSH=$1
if [ -n "${WITH_PUSH}" ]; then if [ -n "${WITH_PUSH}" ]; then
for PHP_VERSION in "${PHP_VERSIONS[@]}"; do for PHP_VERSION in "${PHP_VERSIONS[@]}"; do
docker push "dimti/php:${PHP_VERSION}" PHP_IMAGE=$(dot_version "${PHP_VERSION}")
docker push "dimti/workspace:${PHP_VERSION}"
echo "Push $PHP_IMAGE"
echo
docker push "dimti/php:${PHP_IMAGE}" && \
docker push "dimti/workspace:${PHP_IMAGE}"
echo
done done
fi fi