diff --git a/.github/workflows/dockerize_dev.yml b/.github/workflows/dockerize_dev.yml deleted file mode 100644 index 288fdb8a..00000000 --- a/.github/workflows/dockerize_dev.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: dockerize-dev - -on: - pull_request: - paths: - - src/khoj/** - - config/** - - pyproject.toml - - prod.Dockerfile - - .github/workflows/dockerize_dev.yml - workflow_dispatch: - -env: - DOCKER_IMAGE_TAG: 'dev' - -jobs: - build: - name: Build Production Docker Image, Push to Container Registry - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.PAT }} - - - name: 📦 Build and Push Docker Image - uses: docker/build-push-action@v2 - with: - context: . - file: prod.Dockerfile - platforms: linux/amd64 - push: true - tags: ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }} - build-args: | - PORT=42110 diff --git a/.github/workflows/dockerize_production.yml b/.github/workflows/dockerize_production.yml index 2e1eea4b..c4ed963e 100644 --- a/.github/workflows/dockerize_production.yml +++ b/.github/workflows/dockerize_production.yml @@ -1,6 +1,12 @@ -name: dockerize-prod +name: dockerize production on: + pull_request: + paths: + - src/khoj/** + - pyproject.toml + - prod.Dockerfile + - .github/workflows/dockerize_production.yml push: tags: - "*" @@ -8,14 +14,13 @@ on: - master paths: - src/khoj/** - - config/** - pyproject.toml - prod.Dockerfile - .github/workflows/dockerize_production.yml workflow_dispatch: env: - DOCKER_IMAGE_TAG: ${{ github.ref == 'refs/heads/master' && 'latest' || github.ref_name }} + DOCKER_IMAGE_TAG: ${{ github.event_name == 'pull_request' && 'dev' || (github.ref == 'refs/heads/master' && 'latest' || github.ref_name) }} jobs: build: