From 28181f787254e315bc861fcfd00a7014fb684f74 Mon Sep 17 00:00:00 2001 From: Thibaut Rousseau Date: Sat, 21 Nov 2020 13:04:17 +0100 Subject: [PATCH 1/6] Create docker-publish.yml --- .github/workflows/docker-publish.yml | 70 ++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 00000000..19c17373 --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,70 @@ +name: Docker + +on: + push: + # Publish `master` as Docker `latest` image. + branches: + - master + + # Publish `v1.2.3` tags as releases. + tags: + - v* + + # Run tests for any PRs. + pull_request: + +env: + IMAGE_NAME: mermaid-live-editor + +jobs: + # Run tests. + # See also https://docs.docker.com/docker-hub/builds/automated-testing/ + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Run tests + run: | + docker build . --file Dockerfile + + # Push image to GitHub Packages. + # See also https://docs.docker.com/docker-hub/builds/ + push: + # Ensure test job passes before pushing image. + needs: test + + runs-on: ubuntu-latest + if: github.event_name == 'push' + + steps: + - uses: actions/checkout@v2 + + - name: Build image + run: docker build . --file Dockerfile --tag $IMAGE_NAME + + - name: Log into registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + + - name: Push image + run: | + IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + + # Change all uppercase to lowercase + IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + + # Strip git ref prefix from version + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + + # Strip "v" prefix from tag name + [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') + + # Use Docker `latest` tag convention + [ "$VERSION" == "master" ] && VERSION=latest + + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + + docker tag $IMAGE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION From 3097161aa86fc73fd1ab7724179550a0b02bfe9b Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 5 Jun 2021 00:27:41 +0530 Subject: [PATCH 2/6] Migrate to GHCR --- .github/workflows/docker-publish.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 19c17373..c4f7c606 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -10,15 +10,16 @@ on: tags: - v* - # Run tests for any PRs. + # Run tests for all PRs to master and develop. pull_request: + branches: + - master + - develop env: IMAGE_NAME: mermaid-live-editor jobs: - # Run tests. - # See also https://docs.docker.com/docker-hub/builds/automated-testing/ test: runs-on: ubuntu-latest @@ -29,8 +30,6 @@ jobs: run: | docker build . --file Dockerfile - # Push image to GitHub Packages. - # See also https://docs.docker.com/docker-hub/builds/ push: # Ensure test job passes before pushing image. needs: test @@ -45,11 +44,11 @@ jobs: run: docker build . --file Dockerfile --tag $IMAGE_NAME - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Push image run: | - IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') From e286fb2fb79aa926bcb68985662f9589dfb69319 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 5 Jun 2021 00:41:44 +0530 Subject: [PATCH 3/6] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 204cbca2..4953cb3c 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,14 @@ Edit, preview and share mermaid charts/diagrams. - Get a link to edit the diagram so that someone else can tweak it and send a new link back +## Docker + +```bash +docker run --publish 8000:80 ghcr.io/mermaid-js/mermaid-live-editor +``` + +Then open http://localhost:8000 + ## Setup This project is set up using [Yarn](https://classic.yarnpkg.com/en/docs/getting-started): From 13286ff4d1994f7ced011bd4037cffa8696b2070 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 6 Jun 2021 11:58:07 +0530 Subject: [PATCH 4/6] Release 8.10.2 --- package.json | 2 +- src/app.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2f4589eb..61cde987 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@macfja/svelte-persistent-store": "^1.1.1", "analytics": "^0.7.5", "js-base64": "^3.6.1", - "mermaid": "^8.10.1", + "mermaid": "^8.10.2", "moment": "^2.29.1", "monaco-editor": "^0.24.0", "random-word-slugs": "^0.0.2" diff --git a/src/app.html b/src/app.html index 9fd76e48..1caa0206 100644 --- a/src/app.html +++ b/src/app.html @@ -20,7 +20,7 @@ href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" /> From 8bb611c50c46db5e75f4fc15c25f237b82d33acb Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 6 Jun 2021 11:59:16 +0530 Subject: [PATCH 5/6] Release 8.10.2 --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 03300db6..21d0b317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2998,10 +2998,10 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@^8.10.1: - version "8.10.1" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz#9573f702024e2173f4aa07d9b207d750507cf838" - integrity sha512-KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A== +mermaid@^8.10.2: + version "8.10.2" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.2.tgz#e039df2e42faba08743f167fff85bdccff241f76" + integrity sha512-Za5MrbAOMbEsyY4ONgGjfYz06sbwF1iNGRzp1sQqpOtvXxjxGu/J1jRJ8QyE9kD/D9zj1/KlRrYegWEvA7eZ5Q== dependencies: "@braintree/sanitize-url" "^3.1.0" d3 "^5.7.0" From 876b419c04a7eebb355a35036ee79ee4e8daff48 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 6 Jun 2021 12:02:49 +0530 Subject: [PATCH 6/6] Update SRI --- src/app.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.html b/src/app.html index 1caa0206..c012987c 100644 --- a/src/app.html +++ b/src/app.html @@ -21,7 +21,7 @@ />