diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3fa520d..0566ab1 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -3,7 +3,7 @@ name: Build and push image on: push: branches: - - main + - master jobs: docker-build: @@ -14,6 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + submodules: recursive - name: Login to registry env: @@ -27,6 +29,7 @@ jobs: IMAGE_TAG: ${{ gitea.sha }} run: | docker build \ + -f docker/Dockerfile_app \ -t "${IMAGE_NAME}:${IMAGE_TAG}" \ -t "${IMAGE_NAME}:latest" \ . diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 247a4a0..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,24 +0,0 @@ -docker-build: - image: docker:latest - stage: build - variables: - GIT_SUBMODULE_STRATEGY: normal - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - touch .env - - | - if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then # master - export BUILD_TAG=latest - echo "Running on default branch '$CI_DEFAULT_BRANCH'" - else # tag - export BUILD_TAG="$CI_COMMIT_TAG" - echo "Running on tag = $BUILD_TAG" - fi - - docker compose build - - docker compose push - only: - - master - - tags \ No newline at end of file