From aac8c97a53536f9ed1b8ca7b7d523729fd664734 Mon Sep 17 00:00:00 2001 From: smf Date: Tue, 5 Mar 2024 21:35:49 +0800 Subject: [PATCH 1/2] add pack action --- .github/workflows/main.yml | 40 ----------------------------------- .github/workflows/publish.yml | 17 +++++++++++++++ 2 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index ecff131..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Release - -on: - release: - types: - - created - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: ./ - file: ./Dockerfile - push: true - tags: | - sulthonzh/docker-remote-deployment-action:latest - sulthonzh/docker-remote-deployment-action:${{ github.event.release.tag_name }} - - - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..2fbc0eb --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,17 @@ +on: + push: + tags: + - 'v*.*.*' + pull_request: + branches: + - 'master' + +jobs: + call_workflow_publish_docker: + uses: infrastructure/reusing_workflows/.github/workflows/publish_docker.yml@main + with: + artifact-skip: true + artifact-name: 'artifact' + docker_context: '{{defaultContext}}' + dockerfile_path: './Dockerfile' + secrets: inherit \ No newline at end of file -- 2.49.1 From 30e8216aac2df9f78fa48f4eb22853bad89fe297 Mon Sep 17 00:00:00 2001 From: smf Date: Wed, 6 Mar 2024 11:39:21 +0800 Subject: [PATCH 2/2] no pack --- .github/workflows/publish.yml | 17 ----------------- docker-entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 2fbc0eb..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - push: - tags: - - 'v*.*.*' - pull_request: - branches: - - 'master' - -jobs: - call_workflow_publish_docker: - uses: infrastructure/reusing_workflows/.github/workflows/publish_docker.yml@main - with: - artifact-skip: true - artifact-name: 'artifact' - docker_context: '{{defaultContext}}' - dockerfile_path: './Dockerfile' - secrets: inherit \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ff01feb..234b6e2 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -73,7 +73,7 @@ case $INPUT_DEPLOYMENT_MODE in *) INPUT_DEPLOYMENT_MODE="docker-compose" - DEPLOYMENT_COMMAND="docker-compose -f $STACK_FILE $DEPLOYMENT_COMMAND_OPTIONS" + DEPLOYMENT_COMMAND="docker compose -f $STACK_FILE $DEPLOYMENT_COMMAND_OPTIONS" ;; esac -- 2.49.1