From 7e9037f38d9ddcae906dd76ccd470f3042623f35 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 30 Nov 2023 12:14:17 +0100
Subject: [PATCH] add composer version variable
---
.env | 5 ++++-
build/fpm/Dockerfile | 1 +
build/fpm/installComposer.sh | 2 +-
docker-compose.yml | 3 ++-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.env b/.env
index 4afc9d1..d24f952 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,11 @@
-ENVIRONMENT=production # Environment to deploy to. Can be: development|production
+ENVIRONMENT=development # Environment to deploy to. Can be: development|production
+
NODE_TAG=10
+COMPOSER_VERSION=2.6.5
IMAGE_NAME=metagermaps
IMAGE_TAG=dev
+# If you do not have user id 1000 on your local machine you can switch here to make sure permissions of dynamically created data match your current user
USER_ID=1000 # User ID used in the Docker containers
GROUP_ID=1000 # Group ID used in the Docker containers
\ No newline at end of file
diff --git a/build/fpm/Dockerfile b/build/fpm/Dockerfile
index 07d7ef8..eceed7b 100644
--- a/build/fpm/Dockerfile
+++ b/build/fpm/Dockerfile
@@ -41,6 +41,7 @@ EXPOSE 80
FROM base as composer
+ARG COMPOSER_VERSION
USER root
WORKDIR /mgmaps
diff --git a/build/fpm/installComposer.sh b/build/fpm/installComposer.sh
index 6c531f8..4ae04ae 100644
--- a/build/fpm/installComposer.sh
+++ b/build/fpm/installComposer.sh
@@ -11,7 +11,7 @@ then
exit 1
fi
-php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.6.5
+php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=$COMPOSER_VERSION
RESULT=$?
rm composer-setup.php
exit $RESULT
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e233dc0..422b240 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,8 @@ services:
args:
USER: ${USER_ID}
GROUP: ${GROUP_ID}
- image: ${IMAGE_NAME}/composer:${IMAGE_TAG}
+ COMPOSER_VERSION: ${COMPOSER_VERSION}
+ image: ${IMAGE_NAME}/composer:${COMPOSER_VERSION}
volumes:
- ./app:/html
- composer-cache:/mgmaps/.composer
--
GitLab