From 95c1fa46f53d481cbebdce769bad608f59b0be54 Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Tue, 14 Jun 2022 16:23:02 +0200 Subject: [PATCH] feat(Docker Compose): Test Docker Compose --- .gitlab-ci.yml | 2 +- templates/IaC/docker-compose.gitlab-ci.yml | 2 ++ .../{test.gitlab-ci.yml => test-docker-compose.gitlab-ci.yml} | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) rename test/docker-compose/{test.gitlab-ci.yml => test-docker-compose.gitlab-ci.yml} (90%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a16941..4367db4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ Test-Docker-compose: trigger: strategy: depend include: - - local: "test/docker-compose/test.gitlab-ci.yml" + - local: "test/docker-compose/test-docker-compose.gitlab-ci.yml" check_confluence_validity: diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index c8b134a..6f2ef31 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -11,6 +11,8 @@ SSH_USER: "" SSH_PORT: "22" DOCKER_REGISTRY: "$CI_REGISTRY" + DOCKER_REGISTRY_PASS: "$CI_REGISTRY_PASSWORD" + DOCKER_REGISTRY_USER: "$CI_REGISTRY_USER" ENV_SETUP_FILE: "setup_env.sh" SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY rules: diff --git a/test/docker-compose/test.gitlab-ci.yml b/test/docker-compose/test-docker-compose.gitlab-ci.yml similarity index 90% rename from test/docker-compose/test.gitlab-ci.yml rename to test/docker-compose/test-docker-compose.gitlab-ci.yml index a9a6d13..da04674 100644 --- a/test/docker-compose/test.gitlab-ci.yml +++ b/test/docker-compose/test-docker-compose.gitlab-ci.yml @@ -19,6 +19,8 @@ Docker-compose: SSH_USER: "user" SSH_PORT: "22" DOCKER_REGISTRY: "$CI_REGISTRY" + DOCKER_REGISTRY_PASS: "$CI_REGISTRY_PASSWORD" + DOCKER_REGISTRY_USER: "$CI_REGISTRY_USER" ENV_SETUP_FILE: "setup_env.sh" SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY