From 289fe7b498a1c14d28f7e4a6fc6e07f561093a0c Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 17 Jan 2026 10:44:22 +0100 Subject: [PATCH 1/6] fix Dockerfile to work in 2026 --- .github/workflows/main.yml | 10 +++++----- .gitignore | 4 +++- Dockerfile | 12 +++++++++--- README.md | 8 +++++++- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff3e1e0..227d683 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,11 +5,11 @@ on: [push, pull_request] jobs: build: - strategy: - matrix: - os: [ubuntu-latest] - dotnet: [3.0.100] - runs-on: ${{ matrix.os }} + # strategy: + # matrix: + # os: [ubuntu-latest] + # dotnet: [3.0.100] + # runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 diff --git a/.gitignore b/.gitignore index 946f215..d4b9ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ deploy .ionide/ .fake -.ionide \ No newline at end of file +.ionide +.flox +.yarn diff --git a/Dockerfile b/Dockerfile index fcbb5b2..3bf86dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,11 @@ -FROM nojaf/fable +FROM docker.io/nojaf/fable:2.7 WORKDIR /build -COPY . ./ +COPY .config . RUN dotnet tool restore -RUN dotnet fake build -t Build \ No newline at end of file +COPY paket.* . +RUN dotnet paket restore +COPY yarn.lock . +RUN yarn install --frozen-lockfile +COPY . . +RUN dotnet fake build -t Build +ENTRYPOINT dotnet fake build -t Run \ No newline at end of file diff --git a/README.md b/README.md index 5f0d7d5..3557ad0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ # AncestorsMap [https://jindraivanek.github.io/AncestorsMap](https://jindraivanek.github.io/AncestorsMap) -:) \ No newline at end of file + + +## Build +`podman build -t ancestors-map .` + +## Run +`podman run -p 8080:8080 -it ancestors-map` and visit [http://localhost:8080](http://localhost:8080) \ No newline at end of file From c7718b04792a03ca0db9f82dc8bc1d27db9035ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jind=C5=99ich=20Iv=C3=A1nek?= Date: Sat, 17 Jan 2026 10:48:09 +0100 Subject: [PATCH 2/6] Simplify GitHub Actions workflow configuration Removed commented-out strategy for matrix builds. --- .github/workflows/main.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 227d683..d3e7903 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,13 +4,7 @@ on: [push, pull_request] jobs: build: - - # strategy: - # matrix: - # os: [ubuntu-latest] - # dotnet: [3.0.100] - # runs-on: ${{ matrix.os }} - + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Docker build From 768a890ae77f41de13775d8a0cb34656472cbf5d Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 17 Jan 2026 10:59:29 +0100 Subject: [PATCH 3/6] github pages --- .github/workflows/main.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3e7903..62fe144 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,10 +13,20 @@ jobs: docker create -ti --name dummy ancestors-map bash docker cp dummy:/build/src/Client/deploy . docker rm -f dummy - - name: Deploy - if: success() - uses: peaceiris/actions-gh-pages@v2.5.0 - env: - ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - PUBLISH_BRANCH: gh-pages - PUBLISH_DIR: deploy + # - name: Deploy + # if: success() + # uses: peaceiris/actions-gh-pages@v2.5.0 + # env: + # ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} + # PUBLISH_BRANCH: gh-pages + # PUBLISH_DIR: deploy + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: 'deploy' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From 448c4e7e82c667ceebc5a1dbd0b42f8e03fc1f8e Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 17 Jan 2026 11:04:08 +0100 Subject: [PATCH 4/6] github pages --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 62fe144..e4f3d96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,8 @@ on: [push, pull_request] jobs: build: + permissions: + id-token: write # Needed for GitHub Pages deployment runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 937f4bc809b7cf1c4dfc0cd655dafd9a8f5b25e1 Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 17 Jan 2026 11:07:05 +0100 Subject: [PATCH 5/6] Github pages --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4f3d96..90df384 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ jobs: build: permissions: id-token: write # Needed for GitHub Pages deployment + pages: write runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 410a334db1c31c81cca251a2d4cf4a3bf4644558 Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 17 Jan 2026 11:16:31 +0100 Subject: [PATCH 6/6] personal pages link --- src/Client/Client.fs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Client/Client.fs b/src/Client/Client.fs index 3e475a2..52915c2 100644 --- a/src/Client/Client.fs +++ b/src/Client/Client.fs @@ -222,7 +222,9 @@ let safeComponents = p [ ] [ strong [] [ str "AncestorsMap" ] - str " project by Jindřich Ivánek, GNU General Public License v3.0. " + str " project by " + a [ Href "https://jindraivanek.hashnode.dev" ] [ str "Jindřich Ivánek" ] + str ", GNU General Public License v3.0. " components ] let button txt onClick =