diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3900ea3d11c8ad2044c18070c4a67e73fb75c11..abaab13c1307c1355edf5db08f83c0f87a272fa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,9 +194,9 @@ behave-integration: SECRET: "secret" image: ${CI_REGISTRY_IMAGE}/behave:${CI_COMMIT_REF_NAME} script: - - curl http://hydra:4445/health/alive - - curl http://kratos:4433/health/alive - - curl http://oidc:5000/status + - curl -q http://hydra:4445/health/alive + - curl -q http://kratos:4433/health/alive + - curl -q http://oidc:5000/status # Steps to do: # - create user & access roles & grant access # - add client applition ID + key for testing diff --git a/login/Dockerfile b/login/Dockerfile index de9abf6b48066981cff0976542cbbf39aa883f8e..8733db43087b416b41fe6ef89479cdf96978d78a 100644 --- a/login/Dockerfile +++ b/login/Dockerfile @@ -4,18 +4,11 @@ RUN apk add gcc libc-dev libffi-dev g++ postgresql-dev WORKDIR /usr/src/app -# COPY requirements.txt ./ COPY . . RUN pip install --no-cache-dir -r requirements.txt EXPOSE 5000 -#ENV FLASK_RUN_HOST=0.0.0.0 -#ENV FLASK_RUN_PORT=5000 -#ENV HYDRA_ADMIN_URL=http://localhost:4445 -#ENV KRATOS_PUBLIC_URL=http://localhost:8080 -#ENV KRATOS_ADMIN_URL=http://localhost:8000 -#ENV DATABASE_URL="postgresql://stackspin:stackspin@localhost/stackspin" -#ENV APP_SETTINGS="config.DevelopmentConfig" + CMD [ "flask", "run" ] diff --git a/login/README.md b/login/README.md index 38a189577a5c25615923cfa2432cd65d6e142e77..c9ae7ea3b22e172485d9e052f4381a2cd75f737b 100644 --- a/login/README.md +++ b/login/README.md @@ -1,3 +1,27 @@ +# Environment for Dockerimage + +If you are planning to use the Dockerimage in your setup, please make sure +to load the right environment. The following environment should be set during +deployment/running: + + +``` +FLASK_RUN_HOST=0.0.0.0 +ENV FLASK_RUN_PORT=5000 +APP_SETTINGS="config.DevelopmentConfig" +PUBLIC_URL="https://sso.oas.example.com/login" +``` + +Where API endpoints and database can be found: + +``` +HYDRA_ADMIN_URL=https://sso.oas.example.com/idp +KRATOS_PUBLIC_URL=https://sso.osa.example.com/api +KRATOS_ADMIN_URL=http://kratos-admin:4434 +DATABASE_URL="postgresql://stackspin:stackspin@postgres/stackspin" +``` + + # Development enviroment - Have a cluster running with the latest single-sign-on helmchart