Merge pull request 'Add labels to Docker images' (!75) from docker-labels into main

Reviewed-on: kompetenzinventar/ki-backend#75

.drone.yml

@@ -4,10 +4,17 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 kind: pipeline
 type: docker
-name: default
+name: qa
+
+trigger:
+  event:
+    - push
+    - pull_request
+  branch:
+    - main
 
 steps:
-- name: qa
+  - name: install-lint-test
     image: registry.wtf-eg.net/ki-backend-builder:1.0.0
     commands:
       - pipenv install --dev
@@ -15,7 +22,25 @@ steps:
       - pipenv run reuse lint
       - pipenv run python -m unittest discover ki
 
-- name: docker-publish
+image_pull_secrets:
+  - dockerconfig
+
+---
+kind: pipeline
+type: docker
+name: build
+
+trigger:
+  event:
+    - push
+  branch:
+    - main
+
+depends_on:
+  - qa
+
+steps:
+  - name: docker-publish
     image: plugins/docker
     settings:
       registry: registry.wtf-eg.net
@@ -26,9 +51,63 @@ steps:
         from_secret: "docker_username"
       password:
         from_secret: "docker_password"
-  when:
+
+---
+kind: pipeline
+type: docker
+name: deploy
+
+trigger:
+  event:
+    - push
   branch:
     - main
 
+depends_on:
+  - build
+
+steps:
+  - name: deploy-dev
+    image: appleboy/drone-ssh
+    settings:
+      host:
+        - dev01.wtf-eg.net
+      username: drone_deployment
+      key:
+        from_secret: "dev01_deployment_key"
+      command_timeout: 2m
+      script:
+        - echo "Executing forced command..."
+
+
+---
+kind: pipeline
+type: docker
+name: tag-release
+
+trigger:
+  event:
+    - tag
+
+steps:
+  - name: install-lint-test
+    image: registry.wtf-eg.net/ki-backend-builder:1.0.0
+    commands:
+      - pipenv install --dev
+      - pipenv run flake8
+      - pipenv run reuse lint
+      - pipenv run python -m unittest discover ki
+  - name: docker-publish
+    image: plugins/docker
+    settings:
+      registry: registry.wtf-eg.net
+      repo: registry.wtf-eg.net/ki-backend
+      target: ki-backend
+      auto_tag: true
+      username:
+        from_secret: "docker_username"
+      password:
+        from_secret: "docker_password"
+
 image_pull_secrets:
-- dockerconfig
+  - dockerconfig

.reuse/dep5

@@ -4,7 +4,7 @@ Upstream-Contact: Michael Weimann <mail@michael-weimann.eu>
 Source: https://git.wtf-eg.de/kompetenzinventar/ki-backend
 
 Files: data/imgs/flags/*
-Copyright: 2017 Go Squared Ltd. http://www.gosquared.com/
+Copyright: 2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>
 License: MIT
 
 Files: Pipfile.lock migrations/*

Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FROM registry.wtf-eg.net/ki-backend-builder:1.0.0 as builder
+FROM registry.wtf-eg.net/ki-backend-builder:1.0.1 as builder
 
 COPY Pipfile* ./
 
@@ -10,7 +10,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
 RUN pip3 uninstall --yes pipenv
 
 
-FROM registry.wtf-eg.net/ki-backend-base:1.0.0 as ki-backend
+FROM registry.wtf-eg.net/ki-backend-base:1.0.1 as ki-backend
 
 # Install six explicitly. Otherwise Python complains about it missing.
 RUN pip3 install six
@@ -22,4 +22,9 @@ WORKDIR /app
 
 COPY . .
 
+LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-backend.git
+LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-backend
+LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-backend#docker
+LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
+
 CMD ["python3", "run_prod.py"]

Pipfile

@@ -14,7 +14,7 @@ flask-migrate = "~=3.0.1"
 flask-sqlalchemy  = "~=2.5.1"
 sqlalchemy = "~=1.4.18"
 waitress = "~=2.0.0"
-pyyaml = "~=5.4.1"
+pyyaml = "~=6.0.1"
 flask-cors = "~=3.0.10"
 ldap3 = "~=2.9"
 pymysql = "~=1.0.2"

app.py

@@ -8,22 +8,23 @@ import os
 from dotenv import load_dotenv, find_dotenv
 from flask import Flask
 from flask_cors import CORS
-from flask.logging import default_handler
 from flask_migrate import Migrate
 from flask_sqlalchemy import SQLAlchemy
-from ldap3.utils.log import logger as ldap3_logger
 from ldap3.utils.log import set_library_log_detail_level, BASIC
 
 load_dotenv(find_dotenv())
 
 app = Flask(__name__)
+
+# Configure logging
 loglevel = os.getenv("KI_LOGLEVEL", logging.WARNING)
 loglevel = int(loglevel)
 app.logger.setLevel(loglevel)
-logging.basicConfig(level=loglevel)
+app.logger.propagate = False  # do not forward messages to the root logger
-
+logging.basicConfig(level=loglevel,
-set_library_log_detail_level(BASIC)
+                    format='[%(asctime)s] %(levelname)s [%(name)s] %(message)s')  # configure root logger as fallback
-ldap3_logger.addHandler(default_handler)
+logging.getLogger('werkzeug').propagate = False  # werkzeug has its own ColorStreamHandler
+set_library_log_detail_level(BASIC)  # ldap3 has different verbosity levels internally
 
 app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI")
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
@@ -40,6 +41,6 @@ CORS(app)
 db = SQLAlchemy(app)
 migrate = Migrate(app, db, compare_type=True)
 
-logging.debug("Hello from KI")
+app.logger.info("Hello from KI")
 
 from ki import module  # noqa

data/imgs/flags/Pipfile

@@ -1,11 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-
-[dev-packages]
-
-[requires]
-python_version = "3.8"

data/imgs/flags/bg.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-bg" viewBox="0 0 640 480">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#d62612" d="M0 320h640v160H0z"/>
+    <path fill="#fff" d="M0 0h640v160H0z"/>
+    <path fill="#00966e" d="M0 160h640v160H0z"/>
+  </g>
+</svg>

data/imgs/flags/cs.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-cz" viewBox="0 0 640 480">
+  <path fill="#fff" d="M0 0h640v240H0z"/>
+  <path fill="#d7141a" d="M0 240h640v240H0z"/>
+  <path fill="#11457e" d="M360 240 0 0v480z"/>
+</svg>

data/imgs/flags/da.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-dk" viewBox="0 0 640 480">
+  <path fill="#c8102e" d="M0 0h640.1v480H0z"/>
+  <path fill="#fff" d="M205.7 0h68.6v480h-68.6z"/>
+  <path fill="#fff" d="M0 205.7h640.1v68.6H0z"/>
+</svg>

data/imgs/flags/de.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-de" viewBox="0 0 640 480">
+  <path fill="#ffce00" d="M0 320h640v160H0z"/>
+  <path d="M0 0h640v160H0z"/>
+  <path fill="#d00" d="M0 160h640v160H0z"/>
+</svg>

data/imgs/flags/el.svg

@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gr" viewBox="0 0 640 480">
+  <path fill="#005bae" fill-rule="evenodd" stroke-width="6.7" d="M0 0h640v53.3H0z"/>
+  <path fill="#fff" fill-rule="evenodd" stroke-width="6.7" d="M0 53.3h640v53.4H0z"/>
+  <path fill="#005bae" fill-rule="evenodd" stroke-width="6.7" d="M0 106.7h640V160H0z"/>
+  <path fill="#fff" fill-rule="evenodd" stroke-width="6.7" d="M0 160h640v53.3H0z"/>
+  <path fill="#005bae" stroke-width=".9" d="M0 0h266.7v266.7H0z"/>
+  <path fill="#005bae" fill-rule="evenodd" stroke-width="6.7" d="M0 213.3h640v53.4H0z"/>
+  <path fill="#fff" fill-rule="evenodd" stroke-width="6.7" d="M0 266.7h640V320H0z"/>
+  <path fill="#005bae" fill-rule="evenodd" stroke-width="6.7" d="M0 320h640v53.3H0z"/>
+  <path fill="#fff" fill-rule="evenodd" stroke-width="6.7" d="M0 373.3h640v53.4H0z"/>
+  <g fill="#fff" fill-rule="evenodd" stroke-width="1.3">
+    <path d="M20 0h10v50H20z" transform="scale(5.33333)"/>
+    <path d="M0 20h50v10H0z" transform="scale(5.33333)"/>
+  </g>
+  <path fill="#005bae" stroke-width=".6" d="M0 426.7h640V480H0z"/>
+</svg>

data/imgs/flags/en.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb" viewBox="0 0 640 480">
+  <path fill="#012169" d="M0 0h640v480H0z"/>
+  <path fill="#FFF" d="m75 0 244 181L562 0h78v62L400 241l240 178v61h-80L320 301 81 480H0v-60l239-178L0 64V0h75z"/>
+  <path fill="#C8102E" d="m424 281 216 159v40L369 281h55zm-184 20 6 35L54 480H0l240-179zM640 0v3L391 191l2-44L590 0h50zM0 0l239 176h-60L0 42V0z"/>
+  <path fill="#FFF" d="M241 0v480h160V0H241zM0 160v160h640V160H0z"/>
+  <path fill="#C8102E" d="M0 193v96h640v-96H0zM273 0v480h96V0h-96z"/>
+</svg>