Skip to content

Commit f12fad1

Browse files
authored
Merge pull request #28 from jindraivanek/build-fix-2026
fix Dockerfile to work in 2026
2 parents 22ca391 + 410a334 commit f12fad1

5 files changed

Lines changed: 43 additions & 20 deletions

File tree

.github/workflows/main.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
8-
strategy:
9-
matrix:
10-
os: [ubuntu-latest]
11-
dotnet: [3.0.100]
12-
runs-on: ${{ matrix.os }}
13-
7+
permissions:
8+
id-token: write # Needed for GitHub Pages deployment
9+
pages: write
10+
runs-on: ubuntu-latest
1411
steps:
1512
- uses: actions/checkout@v1
1613
- name: Docker build
@@ -19,10 +16,20 @@ jobs:
1916
docker create -ti --name dummy ancestors-map bash
2017
docker cp dummy:/build/src/Client/deploy .
2118
docker rm -f dummy
22-
- name: Deploy
23-
if: success()
24-
uses: peaceiris/actions-gh-pages@v2.5.0
25-
env:
26-
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
27-
PUBLISH_BRANCH: gh-pages
28-
PUBLISH_DIR: deploy
19+
# - name: Deploy
20+
# if: success()
21+
# uses: peaceiris/actions-gh-pages@v2.5.0
22+
# env:
23+
# ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
24+
# PUBLISH_BRANCH: gh-pages
25+
# PUBLISH_DIR: deploy
26+
- name: Setup Pages
27+
uses: actions/configure-pages@v5
28+
- name: Upload artifact
29+
uses: actions/upload-pages-artifact@v3
30+
with:
31+
# Upload entire repository
32+
path: 'deploy'
33+
- name: Deploy to GitHub Pages
34+
id: deployment
35+
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ deploy
1818
.ionide/
1919

2020
.fake
21-
.ionide
21+
.ionide
22+
.flox
23+
.yarn

Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
FROM nojaf/fable
1+
FROM docker.io/nojaf/fable:2.7
22
WORKDIR /build
3-
COPY . ./
3+
COPY .config .
44
RUN dotnet tool restore
5-
RUN dotnet fake build -t Build
5+
COPY paket.* .
6+
RUN dotnet paket restore
7+
COPY yarn.lock .
8+
RUN yarn install --frozen-lockfile
9+
COPY . .
10+
RUN dotnet fake build -t Build
11+
ENTRYPOINT dotnet fake build -t Run

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
# AncestorsMap
22

33
[https://jindraivanek.github.io/AncestorsMap](https://jindraivanek.github.io/AncestorsMap)
4-
:)
4+
5+
6+
## Build
7+
`podman build -t ancestors-map .`
8+
9+
## Run
10+
`podman run -p 8080:8080 -it ancestors-map` and visit [http://localhost:8080](http://localhost:8080)

src/Client/Client.fs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ let safeComponents =
222222

223223
p [ ]
224224
[ strong [] [ str "AncestorsMap" ]
225-
str " project by Jindřich Ivánek, GNU General Public License v3.0. "
225+
str " project by "
226+
a [ Href "https://jindraivanek.hashnode.dev" ] [ str "Jindřich Ivánek" ]
227+
str ", GNU General Public License v3.0. "
226228
components ]
227229

228230
let button txt onClick =

0 commit comments

Comments
 (0)