From 8599e8e850bdcdf6753ca74bc3fe793654c7aeb8 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 3 Jan 2019 17:06:03 +0100
Subject: [PATCH] #11 Restore env variables after starting a new project
---
Dockerfile | 2 +-
l3d | 2 +-
start-new-project | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3ea3d8b..4209d83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
- version="1.2.1" \
+ version="1.2.2" \
description="Drupal development environment from LakeDrops."
ENV LAKEDROPS_DEV_ENV 1
diff --git a/l3d b/l3d
index b5b5cec..e21c1c8 100755
--- a/l3d
+++ b/l3d
@@ -4,7 +4,7 @@ function help {
echo "L3D - LakeDropsDrupalDev"
echo "========================="
echo ""
- echo "Version: 1.4.0"
+ echo "Version: 1.4.1"
echo "Info and support: https://gitlab.lakedrops.com/docker/l3d"
echo ""
echo "Usage:"
diff --git a/start-new-project b/start-new-project
index 7aca5de..03bc50e 100755
--- a/start-new-project
+++ b/start-new-project
@@ -21,9 +21,15 @@ function truncateCurrentDirectory {
rm .* > /dev/null 2>&1
}
+function restoreEnvFile {
+ echo "PHP_VERSION=${PHP_VERSION}" >>.env
+ echo "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}" >>.env
+}
+
function create {
truncateCurrentDirectory
composer create-project ${PROJECT} . --no-interaction
+ restoreEnvFile
}
while true; do
@@ -48,6 +54,7 @@ while true; do
truncateCurrentDirectory
git clone ${REPOSITORY} .
composer update
+ restoreEnvFile
break
fi
;;
--
GitLab