[TASK] Bamboo proper passwd mapping 20/57620/2
authorAnja <aleichsenring@ab-softlab.de>
Tue, 17 Jul 2018 17:33:59 +0000 (19:33 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 17 Jul 2018 18:19:34 +0000 (20:19 +0200)
The bamboo containers need a better passwd mapping
per agent to set a proper home directory, otherwise
ssh tasks may fail.

Resolves: #85582
Releases: master, 8.7, 7.6
Change-Id: I42b59df7512dd5bd6e00c2c07eee9441cf1aa28c
Reviewed-on: https://review.typo3.org/57620
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/bamboo/src/main/java/core/AbstractCoreSpec.java

index c2bad07..f1719f3 100644 (file)
@@ -170,7 +170,7 @@ abstract public class AbstractCoreSpec {
                             "function phpunit() {\n" +
                             "    docker run \\\n" +
                             "        -u ${HOST_UID} \\\n" +
-                            "        -v /etc/passwd:/etc/passwd \\\n" +
+                            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                             "        -e typo3DatabaseName=func_test \\\n" +
                             "        -e typo3DatabaseUsername=root \\\n" +
@@ -260,7 +260,7 @@ abstract public class AbstractCoreSpec {
                         "function runLint() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -300,7 +300,7 @@ abstract public class AbstractCoreSpec {
                         "function phpunit() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e typo3TestingRedisHost=redis4 \\\n" +
                         "        -e typo3TestingMemcachedHost=memcached1-5 \\\n" +
@@ -461,7 +461,7 @@ abstract public class AbstractCoreSpec {
             "function composer() {\n" +
             "    docker run \\\n" +
             "        -u ${HOST_UID} \\\n" +
-            "        -v /etc/passwd:/etc/passwd \\\n" +
+            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
             "        -e HOME=${HOME} \\\n" +
             "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +