From c4d3c784d3880bc55f4582b079afc68fd02c0a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Sep 2023 17:47:13 +0200 Subject: [PATCH] fix mismatches of variables in Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 29b2764..d7dcde2 100644 --- a/Makefile +++ b/Makefile @@ -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_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) +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 $(PHP_BASE_IMAGE_TAG) PHP_BASE_IMAGE=php:8.2-fpm-alpine -PHP_BASE_IMAGE_CHILL=chill_php82 +PHP_BASE_IMAGE_TARGET=chill_base_php82 +PHP_BASE_IMAGE_TAG=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 $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) . + docker build --pull --target $(PHP_BASE_IMAGE_TARGET) --tag $(PHP_BASE_IMAGE_TAG) . $(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction @$(MAKE) -f $(THIS_FILE) build-assets @$(MAKE) -f $(THIS_FILE) post-install