From fabd9066d645530ab19833a353d96be1af80370d Mon Sep 17 00:00:00 2001
From: Mart van Santen <mart@greenhost.nl>
Date: Tue, 30 Nov 2021 07:55:04 +0100
Subject: [PATCH] Updated comments
---
.gitlab-ci.yml | 1 -
hydra/Dockerfile | 6 ++----
kratos/Dockerfile | 5 +++--
login/app.py | 2 --
postgres/Dockerfile | 4 +---
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b6dc21..372cb03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,7 +210,6 @@ behave-integration:
SECRET: "secret"
image: ${CI_REGISTRY_IMAGE}/behave:${CI_COMMIT_REF_NAME}
script:
- - sleep 30
- curl http://hydra:4445/health/alive
- curl http://kratos:4433/health/alive
- curl http://oidc:5000/status
diff --git a/hydra/Dockerfile b/hydra/Dockerfile
index dd2862f..79d7efb 100644
--- a/hydra/Dockerfile
+++ b/hydra/Dockerfile
@@ -3,12 +3,10 @@
# This Dockerfile is only used for testing CI/CD testing and is not used in
# production.
-
-
FROM oryd/hydra:latest
+# Set DSN in Dockerfile, as services variables in CI/CD testing as shared
+# between services and the DSN is different for different services.
ENV DSN="postgres://hydra:hydra@postgres/hydra"
-#COPY identity.default.schema.json /etc/config/identity.default.schema.json
-#COPY kratos.yaml /etc/config/kratos.yaml
diff --git a/kratos/Dockerfile b/kratos/Dockerfile
index cd2af48..9ce79d0 100644
--- a/kratos/Dockerfile
+++ b/kratos/Dockerfile
@@ -3,12 +3,13 @@
# This Dockerfile is only used for testing CI/CD testing and is not used in
# production.
-
-
FROM oryd/kratos:latest-sqlite
+# Set DSN in Dockerfile, as services variables in CI/CD testing as shared
+# between services and the DSN is different for different services.
ENV DSN="postgres://kratos:kratos@postgres/kratos"
+# Copy testing schema and config into image
COPY identity.default.schema.json /etc/config/identity.default.schema.json
COPY kratos.yaml /etc/config/kratos.yaml
diff --git a/login/app.py b/login/app.py
index bcee97f..68f4528 100644
--- a/login/app.py
+++ b/login/app.py
@@ -34,8 +34,6 @@ from ory_kratos_client.model.admin_create_self_service_recovery_link_body import
from ory_kratos_client.model.identity_state import IdentityState
-print(os.environ)
-
# Initaliaze the FLASK app
app = Flask(__name__,
static_url_path='/static')
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 5bb1e5c..3f567af 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -4,10 +4,8 @@
# This Dockerfile is only used for testing CI/CD testing and is not used in
# production.
-
-
FROM postgres:latest
-
+# Copy our setup SQL to the image to create databases at setup/first run
COPY setup.sql /docker-entrypoint-initdb.d/setup.sql
--
GitLab