diff --git a/.gitea/workflows/testing.yaml b/.gitea/workflows/build.yaml similarity index 100% rename from .gitea/workflows/testing.yaml rename to .gitea/workflows/build.yaml diff --git a/Backend/go.mod b/Backend/go.mod index 6987c36..d5c6953 100644 --- a/Backend/go.mod +++ b/Backend/go.mod @@ -1,8 +1,6 @@ module arbeitszeitmessung -go 1.23.0 - -toolchain go1.24.5 +go 1.24.5 require github.com/lib/pq v1.10.9 diff --git a/Docker/docker-compose.dev.yml b/Docker/docker-compose.dev.yml index 2abeb41..b1884d8 100644 --- a/Docker/docker-compose.dev.yml +++ b/Docker/docker-compose.dev.yml @@ -20,7 +20,7 @@ services: - 8001:8080 backend: build: ../Backend - image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1 + image: git.letsstein.de/tom/arbeitszeitmessung restart: unless-stopped env_file: - .env diff --git a/Docker/docker-compose.test.yml b/Docker/docker-compose.test.yml index fbfeb50..0d5e807 100644 --- a/Docker/docker-compose.test.yml +++ b/Docker/docker-compose.test.yml @@ -7,7 +7,6 @@ services: - .env.test environment: PGDATA: /var/lib/postgresql/data/pg_data - volumes: - - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d + # volumes: //- ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d ports: - 5433:5432 diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml index f484d08..272fc49 100644 --- a/Docker/docker-compose.yml +++ b/Docker/docker-compose.yml @@ -17,7 +17,7 @@ services: - 5432:5432 backend: - image: git.letsstein.de/tom/arbeitszeit-backend + image: git.letsstein.de/tom/arbeitszeitmessung env_file: - .env environment: diff --git a/Jenkinsfile b/Jenkinsfile index 868f7ec..a5d5f5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,9 @@ pipeline { DOCKER_USERNAME = 'jenkins' DOCKER_PASSWORD = credentials('gitea_jenkins') SONAR_TOKEN = credentials('sonarcube_token') + POSTGRES_USER = 'postgres' + POSTGRES_PASSWORD = 'password' + POSTGRES_DB = 'arbeitszeitmessung' } agent any @@ -11,30 +14,53 @@ pipeline { stage('Test') { agent { docker { - image 'golang:alpine' + image '' + args '' + args '' } } steps { - sh 'cd Backend && go mod download && go mod verify' - sh 'make test' - } - } - stage('SonarCube Analysis') { - steps { - sh 'make scan' - } - } - stage('Building image arbeitszeit-backend') { - when { - anyOf { - changeset 'Jenkinsfile' - changeset 'Makefile' - changeset 'Backend/**' + script { + sh ''' + docker run -d --rm \ + --name test-db \ + -e POSTGRES_USER={$POSTGRES_USER} \ + -e POSTGRES_PASSWORD={$POSTGRES_PASSWORD} \ + -e POSTGRES_DB={$POSTGRES_DB} \ + -v ./DB/initdb:/docker-entrypoint-initdb.d\ + -p "5432:5432" \ + postgres:16 + ''' + // docker.image('golang:1.24.5').withRun( + // '-u root:root --network=host' + // ) { go -> + // // wait for DB to start + // sh ''' + // cd Backend \ + // go mod download && go mod tidy \ + // go test ./... -v + + // ''' + // } } } - steps { - sh 'make backend' - } } + stage('SonarCube Analysis') { + steps { + sh 'make scan' + } + } + stage('Building image arbeitszeit-backend') { + when { + anyOf { + changeset 'Jenkinsfile' + changeset 'Makefile' + changeset 'Backend/**' + } + } + steps { + sh 'make backend' + } + } } }