diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 76eecd4..0cea16b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,7 @@ on: - '**' tags: - '*.*.*' + workflow_dispatch: pull_request: branches: - master @@ -50,15 +51,15 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 3b1cc75..d07e2de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,5 @@ WORKDIR /var/lib/tiddlywiki ADD init-and-run-wiki /usr/local/bin/init-and-run-wiki # Meta +ENTRYPOINT ["/bin/sh"] CMD ["/usr/local/bin/init-and-run-wiki"]