From 5f01821d3f651d96cf40489bf20e488ac5652cd0 Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Fri, 26 Dec 2025 11:18:58 +0300 Subject: [PATCH] push to dockerhub_dev_and_main --- .github/workflows/main.yaml | 36 +++++++++++++++++++++++++++++++++--- docker-compose.yaml | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 5b419b7..7d582ae 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -2,7 +2,8 @@ name: miniCRM workflow on: push: - branches: [ dev ] + branches: + - '**' jobs: lint: @@ -34,10 +35,13 @@ jobs: run: | flake8 . --count --statistics --show-source - build_and_push_to_docker_hub: - name: miniCRM Push Docker Image to Docker Hub + push_branch_dev_to_docker_hub: + name: Build and Push Docker (dev) runs-on: ubuntu-latest needs: lint + + if: github.ref == 'refs/heads/dev' + steps: - name: Check out the repo uses: actions/checkout@v4 @@ -56,3 +60,29 @@ jobs: push: true tags: | dmsn/minicrm:dev + + push_branch_main_to_docker_hub: + name: Build and Push Docker (prod) + runs-on: ubuntu-latest + needs: lint + + if: github.ref == 'refs/heads/main' + + steps: + - name: Check out the repo + uses: actions/checkout@v4 + + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Push to Docker Hub + uses: docker/build-push-action@v5 + with: + push: true + tags: | + dmsn/minicrm:prod diff --git a/docker-compose.yaml b/docker-compose.yaml index 2a9c7c6..6cb5ca5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,7 +10,7 @@ services: env_file: - ./.env backend: - image: dmsn/minicrm:latest + image: dmsn/minicrm:${{IMAGE_TAG}} restart: always depends_on: - db