Skip to content

Switch preview from static build to DSPublisher dev server #5353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Artur- wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Switch preview from static build to DSPublisher dev server #5353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3642f7c
Switch preview from static build to DSPublisher dev server
Artur- Mar 12, 2026
fff8d7e
Fix syntax
Artur- Mar 12, 2026
b011282
Fix syntax
Artur- Mar 12, 2026
9f560e2
Split username/key from VAADIN_PRO_KEY secret
Artur- Mar 14, 2026
51fa4b8
Merge branch 'main' into dspreview
Artur- Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/preview-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

- name: Set Fly secrets
run: |
echo "${{ secrets.VAADIN_PRO_KEY }}" | flyctl secrets set VAADIN_PRO_KEY=- --app "${{ env.FLY_APP }}" --stage
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

- name: Generate fly.toml
run: |
cat > fly.toml <<EOF
Expand All @@ -49,15 +55,15 @@ jobs:

[[vm]]
size = "shared-cpu-1x"
memory = "256mb"
memory = "1024mb"
EOF

- name: Deploy to Fly.io
run: |
flyctl deploy \
--ha=false \
--remote-only \
--build-arg VAADIN_PRO_KEY="${{ secrets.VAADIN_PRO_KEY }}"
--build-secret VAADIN_PRO_KEY="${{ secrets.VAADIN_PRO_KEY }}"
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

Expand Down
24 changes: 12 additions & 12 deletions Dockerfile.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile.preview
# Builds the AsciiDoc documentation and serves the static output.
# Serves the AsciiDoc documentation using DSPublisher's dev server.

FROM node:24-alpine AS build
FROM node:24-alpine

RUN apk add --no-cache openjdk21 maven

Expand All @@ -19,17 +19,17 @@ COPY articles/ articles/
COPY dspublisher/ dspublisher/
COPY frontend/ frontend/

ARG VAADIN_PRO_KEY
RUN mkdir -p ~/.vaadin && echo "{\"proKey\":\"$VAADIN_PRO_KEY\"}" > ~/.vaadin/proKey
RUN mvn compile vaadin:prepare-frontend vaadin:build-frontend -B
RUN npx -y @vaadin/dspublisher@3.0.0-alpha.13 --build

FROM node:24-alpine

RUN npm install -g serve
RUN mvn compile vaadin:prepare-frontend -B

COPY --from=build /app/dspublisher/out/public /app/public
RUN --mount=type=secret,id=VAADIN_PRO_KEY \
mkdir -p ~/.vaadin && \
SECRET="$(cat /run/secrets/VAADIN_PRO_KEY)" && \
USERNAME="${SECRET%%/*}" && \
PROKEY="${SECRET#*/}" && \
echo "{\"username\":\"$USERNAME\",\"proKey\":\"$PROKEY\"}" > ~/.vaadin/proKey && \
mvn vaadin:build-frontend -B && \
rm -f ~/.vaadin/proKey

EXPOSE 8210

CMD ["serve", "/app/public", "-l", "8210"]
CMD sh -c 'mkdir -p ~/.vaadin && USERNAME="${VAADIN_PRO_KEY%%/*}" && PROKEY="${VAADIN_PRO_KEY#*/}" && echo "{\"username\":\"$USERNAME\",\"proKey\":\"$PROKEY\"}" > ~/.vaadin/proKey && HOST=0.0.0.0 npx -y @vaadin/dspublisher@3.0.0-alpha.14 --develop'
Loading