From 24c06f6080f16707fed084b0e79c703352c4511f Mon Sep 17 00:00:00 2001 From: m0wer Date: Mon, 3 Apr 2023 21:21:24 +0200 Subject: [PATCH 1/5] update to 5.2.7 --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 50b1d80..3b1cc75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:alpine -RUN npm install -g tiddlywiki@5.2.6 +RUN npm install -g tiddlywiki@5.2.7 # Setup wiki volume VOLUME /var/lib/tiddlywiki diff --git a/README.md b/README.md index 2569e96..e4fc6ad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Hub](https://hub.docker.com/r/m0wer/tiddlywiki). Image Name | Tag | TiddyWiki Version -----------------|------------|------------------ -m0wer/tiddlywiki | latest | 5.2.6 +m0wer/tiddlywiki | latest | 5.2.7 m0wer/tiddlywiki | v[X] | [X] m0wer/tiddlywiki | test | ? From 00c8f052e5222418f63a671a0aa359d73558cc37 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 4 Apr 2023 17:24:51 +0200 Subject: [PATCH 2/5] Set correct entrypoint --- Dockerfile | 1 + 1 file changed, 1 insertion(+) 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"] From 3c862c8e896920325ed7eba9813d4b2d81e744b5 Mon Sep 17 00:00:00 2001 From: Florian Vahl Date: Tue, 4 Apr 2023 18:10:28 +0200 Subject: [PATCH 3/5] Bump action versions --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 76eecd4..7a639ed 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,13 +50,13 @@ 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 push: ${{ github.event_name != 'pull_request' }} From 7e13280efbfa7009d5a89a5f8a311320b8daaa4d Mon Sep 17 00:00:00 2001 From: Florian Vahl Date: Sun, 16 Apr 2023 20:46:41 +0200 Subject: [PATCH 4/5] Remove ARMv7 target until node freeze is fixed --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7a639ed..c0f9211 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,7 +58,7 @@ jobs: - name: Build and push 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 }} From e1189048d9ed734857b5bf93a0958b014f7ffe09 Mon Sep 17 00:00:00 2001 From: Florian Vahl Date: Sun, 16 Apr 2023 20:50:40 +0200 Subject: [PATCH 5/5] Enabeling manual workflow dispatch --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c0f9211..0cea16b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,7 @@ on: - '**' tags: - '*.*.*' + workflow_dispatch: pull_request: branches: - master