Chill-project/chill-skeleton-basic
6
0
Fork 1
Code Issues Pull Requests 4 Actions Packages Projects Releases Activity

adapt Makefile and rename chill_php occurences by chill_php82

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-02-01 14:27:57 +01:00
parent d38e9a5c0a
commit e9c478c062
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
PWD:=$(shell echo ${PWD})
UID:=$(shell id -u)
GID:=$(shell id -g)
BASE_TAG=chill_base_php
BASE_TAG=chill_base_php82
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
PHP_BASE_IMAGE=php:7.4-fpm-buster
PHP_BASE_IMAGE_CHILL=chill_base_php
PHP_BASE_IMAGE=php:8.2-fpm-alpine
PHP_BASE_IMAGE_CHILL=chill_php82
NGINX_BASE_IMAGE=nginx
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
ifneq (,$(wildcard ./.env))
@ -39,7 +39,7 @@ build-assets:
$(DOCKERNODE_CMD) yarn run encore production
init:
docker build --target chill_base_php -t $(BASE_TAG) .
docker build --target $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) .
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
@$(MAKE) -f $(THIS_FILE) build-assets
@$(MAKE) -f $(THIS_FILE) post-install

2
docker-compose.dev.yml
View File

@ -8,7 +8,7 @@ services:
args:
UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest}
image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
volumes:
- .:/var/www/app
environment:

2
docker-compose.prod.yml
View File

@ -10,7 +10,7 @@ services:
args:
UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest}
image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
#
# normally, you should not mount any volume and use your own image
#

2
docker-compose.yml
View File

@ -8,7 +8,7 @@ services:
args:
UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed
image: ${IMAGE_PHP:-chill_php}:${VERSION:-latest}
image: ${IMAGE_PHP:-chill_php82}:${VERSION:-latest}
volumes:
- .:/var/www/app
environment: