diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 09ce3da..f667fb3 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -11,14 +11,16 @@ steps: repo: my-apps/labmap-frontend dockerfile: frontend/Dockerfile context: frontend + TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}' tags: - latest - ${CI_COMMIT_SHA:0:7} - - develop-${CI_BUILD_NUMBER} + - ${TAG_SUFFIX} username: from_secret: DOCKER_USERNAME password: from_secret: DOCKER_PASSWORD + build-backend: name: Build & Push Backend @@ -32,10 +34,11 @@ steps: repo: my-apps/labmap-backend dockerfile: backend/Dockerfile context: backend + TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}' tags: - latest - ${CI_COMMIT_SHA:0:7} - - develop-${CI_BUILD_NUMBER} + - ${TAG_SUFFIX} username: from_secret: DOCKER_USERNAME password: diff --git a/backend/main.py b/backend/main.py index 0f6b923..21d4717 100644 --- a/backend/main.py +++ b/backend/main.py @@ -81,6 +81,5 @@ def list_icons(): return categories - if __name__ == "__main__": uvicorn.run(app, host="0.0.0.0", port=8000)