Merge branch '103-add-login-panel-ci-cd-to-create-docker-image' into...

Merge branch '103-add-login-panel-ci-cd-to-create-docker-image' into 104-allow-cli-to-set-password-create-inital-admin-user

.gitlab-ci.yml

@@ -3,9 +3,7 @@ include:
 
 stages:
   - build
-  - build-test-images
-  # TODO: Re-enable after fixing #82
-  # - lint
+  - lint
   # TODO: Re-enable after fixing #73
   # - application-test
   - integration-test
@@ -102,7 +100,7 @@ hydra:
 
 # A Fake SSO app to test the behaviour
 sso_testapp:
-  stage: build-test-images
+  stage: build
   variables:
     KANIKO_CONTEXT: "test/sso_testapp/"
     KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
@@ -113,7 +111,7 @@ sso_testapp:
 
 # Image to test behaviour (web)
 behave:
-  stage: build-test-images
+  stage: build
   variables:
     KANIKO_CONTEXT: "test/behave"
     KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
@@ -172,7 +170,8 @@ behave-integration:
     URLS_CONSENT: http://oidc:5000/login
     URLS_LOGIN: http://oidc:5000/consent
     SECRETS_SYSTEM: RandomSecretForTesting
-    # For postgres image
+    # For postgres image super user credentials, additional credentials are
+    # created from `.gitlab/ci/postgres/setup.sql` during initialization
     POSTGRES_PASSWORD: postgres
     POSTGRES_USER: postgres
     POSTGRES_DB: postgres
@@ -209,29 +208,24 @@ behave-integration:
     when: on_failure
 
 
-# TODO: Fix https://open.greenhost.net/stackspin/single-sign-on/-/issues/82
-#
-#pylint:
-#  stage: build-test-images
-#  variables:
-#    KANIKO_CONTEXT: "test/lint/pylint"
-#    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
-#  extends: .kaniko_build
-#  only:
-#    changes:
-#      - test/lint/pylint/Dockerfile
-#      - test/lint/pylint/requirements.txt
-#      - .gitlab-ci.yml
-#
-# pylint-lint:
-#   stage: lint
-#   variables:
-#     GIT_AUTHOR_NAME: "RUNNER"
-#     GIT_AUTHOR_EMAIL: "runner@greenhost.net"
-#     PYLINT_PLUGINS: "pylint_flask pylint_flask_sqlalchemy"
-#   image: ${CI_REGISTRY_IMAGE}/pylint:${CI_COMMIT_REF_NAME}
-#   script:
-#     - echo "Reverting back to main to squash commits"
-#     - git reset --soft main
-#     - git lint
+pylint:
+  stage: build
+  variables:
+    KANIKO_CONTEXT: "test/lint/pylint"
+    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+  extends: .kaniko_build
+  only:
+    changes:
+      - test/lint/pylint/Dockerfile
+      - test/lint/pylint/requirements.txt
+      - .gitlab-ci.yml
 
+pylint-lint:
+  stage: lint
+  variables:
+    GIT_STRATEGY: clone
+    GIT_DEPTH: 0
+    PYLINT_PLUGINS: "pylint_flask pylint_flask_sqlalchemy"
+  image: ${CI_REGISTRY_IMAGE}/pylint:${CI_COMMIT_REF_NAME}
+  script:
+    - darker --check -i -L pylint --diff --revision remotes/origin/main .

test/lint/pylint/Dockerfile

-FROM python:3.9-alpine
+FROM python:3.10-alpine
 
-RUN apk add build-base git bc
+COPY requirements.txt /
 
-COPY requirements.txt ./
-RUN pip3 install --no-cache-dir -r requirements.txt
+RUN apk add --no-cache \
+      build-base=0.5-r2 \
+      git=2.34.1-r0 \
+      bc=1.07.1-r1 && \
+    pip3 install --no-cache-dir -r requirements.txt

test/lint/pylint/requirements.txt

+darker
 pylint
 pylint-flask-sqlalchemy
 pylint-flask
-git-lint