Skip to content

Commit

Permalink
Merge branch 'main' into blockModelV3
Browse files Browse the repository at this point in the history
  • Loading branch information
danalvrz authored Oct 9, 2024
2 parents 5f048fb + 413d02d commit 2ea72ee
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 22 deletions.
10 changes: 2 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# syntax=docker/dockerfile:1
ARG VOLTO_VERSION
# TODO: Replace with
# FROM plone/frontend-builder:${VOLTO_VERSION}
# when the main image is ready
FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} as builder
FROM plone/frontend-builder:${VOLTO_VERSION} as builder

COPY --chown=node packages/volto-light-theme /app/packages/volto-light-theme
COPY --chown=node volto.config.js /app/
Expand All @@ -17,10 +14,7 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
pnpm install --prod
EOT

# TODO: Replace with
# FROM plone/frontend-prod-config:${VOLTO_VERSION}
# when the main image is ready
FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION}
FROM plone/frontend-prod-config:${VOLTO_VERSION}

LABEL maintainer="Plone Foundation <[email protected]>" \
org.label-schema.name="adfsdf-frontend" \
Expand Down
43 changes: 29 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2ea72ee

Please sign in to comment.