From 4043d7b3a9c8c11282dcd4db6c0f9e758a20b054 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 19 Dec 2018 15:16:55 +0100
Subject: [PATCH] Add an environment variable LAKEDROPS_DEV_DC_OPTIONS for
docker compose
---
README.md | 2 +-
php-7.0/Dockerfile | 4 +++-
php-7.1/Dockerfile | 4 +++-
php-7.2/Dockerfile | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 9d6e34b..4767a25 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Register a runner with GitLab Runner and configure it like this:
executor = "docker"
[runners.docker]
tls_verify = false
- image = "registry.lakedrops.com/docker/gitlab-drupal-ci"
+ image = "registry.lakedrops.com/docker/gitlab-drupal-ci:php-7.2"
privileged = true
disable_entrypoint_overwrite = false
oom_kill_disable = false
diff --git a/php-7.0/Dockerfile b/php-7.0/Dockerfile
index 62aefbe..68cc31c 100644
--- a/php-7.0/Dockerfile
+++ b/php-7.0/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.5
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
- version="1.2.1" \
+ version="1.3.0" \
description="An image for GitLab runner to build and test Drupal projects."
ARG compose_version=1.21.2
@@ -108,3 +108,5 @@ RUN mkdir -p /root/.ssh && \
ln -s /usr/local/bin/composer /usr/local/bin/c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/d-c && \
ln -s /usr/local/bin/drush /usr/local/bin/d
+
+ENV LAKEDROPS_DEV_DC_OPTIONS "-T"
diff --git a/php-7.1/Dockerfile b/php-7.1/Dockerfile
index 61b9c21..aec3844 100644
--- a/php-7.1/Dockerfile
+++ b/php-7.1/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
- version="1.2.1" \
+ version="1.3.0" \
description="An image for GitLab runner to build and test Drupal projects."
ARG compose_version=1.21.2
@@ -104,3 +104,5 @@ RUN mkdir -p /root/.ssh && \
ln -s /usr/local/bin/composer /usr/local/bin/c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/d-c && \
ln -s /usr/local/bin/drush /usr/local/bin/d
+
+ENV LAKEDROPS_DEV_DC_OPTIONS "-T"
diff --git a/php-7.2/Dockerfile b/php-7.2/Dockerfile
index 66b6cd5..2a28ff5 100644
--- a/php-7.2/Dockerfile
+++ b/php-7.2/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
LABEL com.example.vendor="LakeDrops" \
maintainer="juergen.haas@lakedrops.com" \
- version="1.2.1" \
+ version="1.3.0" \
description="An image for GitLab runner to build and test Drupal projects."
ARG compose_version=1.21.2
@@ -104,3 +104,5 @@ RUN mkdir -p /root/.ssh && \
ln -s /usr/local/bin/composer /usr/local/bin/c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/d-c && \
ln -s /usr/local/bin/drush /usr/local/bin/d
+
+ENV LAKEDROPS_DEV_DC_OPTIONS "-T"
--
GitLab