Added missing dgoss installation

.woodpecker/build.yaml

@@ -0,0 +1,49 @@
+when:
+  - event: push
+    branch: woodpecker
+
+steps:
+  - name: code-tests
+    image: python:3.11.7-alpine
+    commands:
+      - cd api
+      - python3 -m venv env
+      - source env/bin/activate
+      - pip install -r requirements.txt pytest
+      - python3 -m pytest --junit-xml=pytest_junit.xml
+
+  - name: build
+    image: docker:dind
+    privileged: true
+    environment:
+      ACR_USERNAME: marcin00
+      ACR_PASSWORD:
+        from_secret: acr_password
+    commands:
+      - dockerd-entrypoint.sh &
+      - sleep 10  # czas na uruchomienie usługi Docker
+      
+      - DOCKER_IMAGE=marcin00.azurecr.io/user-microservice:$CI_COMMIT_SHA
+
+      - echo "===> Building Docker image"
+      - docker build -t $DOCKER_IMAGE .
+
+      - echo "===> Installing bash"
+      - apk add --no-cache bash
+
+      - echo "===> Installing goss"
+      - wget https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -O goss
+      - wget https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -O dgoss
+      - chmod +x *goss
+
+      - echo "===> Starting container for test"
+      - export GOSS_OPTS="-f junit"
+      - export GOSS_PATH=./goss
+      - export GOSS_SLEEP=3
+      - "./dgoss run -e SQLALCHEMY_DATABASE_URI=sqlite:///:memory: $DOCKER_IMAGE > goss_junit.xml"
+
+      - echo "===> Logging in to ACR"
+      - echo "$ACR_PASSWORD" | docker login marcin00.azurecr.io -u $ACR_USERNAME --password-stdin
+
+      - echo "===> Pushing image to ACR"
+      - docker push $DOCKER_IMAGE

Jenkinsfile

@@ -0,0 +1,72 @@
+pipeline {
+    agent any
+    environment {
+        DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
+        DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
+        ACR_NAME = 'marcin00'
+    }
+    stages {
+        stage('Checkout') {
+            steps {
+                checkout scm
+            }
+        }
+        stage('Test python app') {
+            steps {
+                script {
+                    dir('api') {
+                        sh '''
+                            python3 -m venv env
+                            source env/bin/activate
+                            pip install -r requirements.txt pytest
+                            python3 -m pytest --junit-xml=pytest_junit.xml
+                        '''
+                    }
+                }
+            }
+            post {
+                always {
+                    junit testResults: '**/*pytest_junit.xml'
+                }
+            }
+        }
+        stage('Build & test docker image') {
+            steps {
+                script {
+                    appImage = docker.build("${DOCKER_IMAGE}")
+
+                    sh label: 'Install dgoss', script: '''
+                        curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o goss
+                        curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -o dgoss
+                        chmod +rx *goss
+                    '''
+                    
+                    withEnv(['GOSS_OPTS=-f junit', 'GOSS_PATH=./goss', 'GOSS_SLEEP=3', 'SQLALCHEMY_DATABASE_URI=sqlite:///:memory:']) {
+                        sh label: 'run image tests', script: './dgoss run -e SQLALCHEMY_DATABASE_URI=sqlite:///:memory: ${DOCKER_IMAGE} > goss_junit.xml'
+                    }
+                }
+            }
+            post {
+                always {
+                    junit testResults: '**/*goss_junit.xml'
+                }
+            }
+        }
+        stage('Deploy') {
+            steps {
+                script {
+                    sh '''
+                        az login --identity
+                        az acr login --name ${ACR_NAME}
+                        docker push ${DOCKER_IMAGE}
+                    '''
+                }
+            }
+        }
+    }
+    post {
+        cleanup {
+            script { cleanWs() }
+        }
+    }
+}

api/app.py

@@ -4,7 +4,7 @@ from flask_jwt_extended import JWTManager
 from jwt import ExpiredSignatureError
 from models import db, RevokedToken
 import os
-from utils import init_db, wait_for_db
+from utils import init_db
 from views import user_bp
 from werkzeug.exceptions import HTTPException
 
@@ -53,7 +53,6 @@ def create_app(config_name="default"):
 
     # Fill database by initial values (only if we are not testing)
     with app.app_context():
-        wait_for_db()
         db.create_all()
         if config_name != "testing":
             init_db()

api/utils.py

@@ -2,9 +2,6 @@ from flask import abort
 from flask_jwt_extended import get_jwt_identity
 from models import User, db
 import os
-from sqlalchemy import text
-from sqlalchemy.exc import DatabaseError
-import time
 from werkzeug.security import generate_password_hash
 
 
@@ -30,22 +27,6 @@ def get_user_or_404(user_id):
     return user
 
 
-MAX_RETRIES = 100
-
-def wait_for_db():
-    for retries in range(MAX_RETRIES):
-        try:
-            with db.engine.connect() as connection:
-                connection.execute(text("SELECT 1"))
-            print("Successfully connected with database.")
-            return
-        except DatabaseError:
-            print(f"Waiting for database... (retry {retries + 1})")
-            time.sleep(3)
-    print("Failed to connect to database.")
-    raise Exception("Database not ready after multiple retries.")
-
-
 def init_db():
     """Create default admin account if database is empty"""
     with db.session.begin():

goss.yaml

@@ -0,0 +1,8 @@
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - 0.0.0.0
+process:
+  python3:
+    running: true