diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 1f7c3bb..5508c86 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -54,6 +54,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ./ + file: docker/Dockerfile # platforms: linux/amd64,linux/arm64 push: true tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e295140..6bcdf29 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,6 +51,7 @@ jobs: with: context: . platforms: linux/amd64 + file: docker/Dockerfile push: true tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest diff --git a/.github/workflows/release2.yaml b/.github/workflows/release2.yaml index 35a81a4..7268815 100644 --- a/.github/workflows/release2.yaml +++ b/.github/workflows/release2.yaml @@ -1,11 +1,11 @@ name: release-dev -run-name: release-dev ${{ github.actor }} +run-name: release-dev ${{ github.actor }} on: # push: # tags: # - 'v[0-9]+.[0-9]+.[0-9]+' - # tags-ignore: - # - '2.*' + # tags-ignore: + # - '2.*' # Allow run workflow manually from Action tab workflow_dispatch: env: @@ -36,7 +36,7 @@ jobs: echo ${{ steps.gen_ver.outputs.image_ver }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v2 - name: Login in to registry uses: docker/login-action@v2 with: @@ -45,8 +45,9 @@ jobs: password: ${{secrets.DOCKER_PASS}} - name: Build and push docker image uses: docker/build-push-action@v3 - with: + with: context: ./ + file: docker/Dockerfile push: true tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest - name: Remote Deployment @@ -61,5 +62,3 @@ jobs: docker-compose pull docker-compose up -d touch success - - diff --git a/.github/workflows/remote-build.yaml b/.github/workflows/remote-build.yaml index 1a580f1..ee22b03 100644 --- a/.github/workflows/remote-build.yaml +++ b/.github/workflows/remote-build.yaml @@ -1,11 +1,11 @@ name: remote-build -run-name: remote-build ${{ github.actor }} +run-name: remote-build ${{ github.actor }} on: # push: # tags: # - 'v[0-9]+.[0-9]+.[0-9]+' - # tags-ignore: - # - '2.*' + # tags-ignore: + # - '2.*' # Allow run workflow manually from Action tab workflow_dispatch: env: @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v3 # skip Set up QEMU because it fail on act and container - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v2 - name: Login in to registry uses: docker/login-action@v2 with: @@ -34,8 +34,9 @@ jobs: # node-version: '18' - name: Build and push docker image uses: docker/build-push-action@v3 - with: + with: context: ./ + file: docker/Dockerfile # platforms: linux/amd64,linux/arm64 push: true tags: ${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:${{env.CMS_IMAGE_TAG}},${{env.REGISTRY}}/${{env.CMS_IMAGE_NAME}}:latest @@ -51,5 +52,3 @@ jobs: # docker-compose pull # docker-compose up -d # touch success - -