Skip to content

Commit

Permalink
Merge pull request #47 from kitconcept/upgradeto43
Browse files Browse the repository at this point in the history
Upgrade to Volto a43
  • Loading branch information
sneridagh authored Sep 16, 2024
2 parents c84c46e + 4a6f6af commit 5356c71
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 60 deletions.
10 changes: 2 additions & 8 deletions frontend/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-intranet /app/packages/volto-intranet
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="kitconcept GmbH <info@kitconcept.com>" \
org.label-schema.name="kitconcept.intranet-frontend" \
Expand Down
4 changes: 2 additions & 2 deletions frontend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ start: ## Starts Volto, allowing reloading of the add-on during development
build: ## Build a production bundle for distribution of the project with the add-on
pnpm build

core/packages/registry/dist: core/packages/registry/src
core/packages/registry/dist: $(shell find core/packages/registry/src -type f)
pnpm --filter @plone/registry build

core/packages/components/dist: core/packages/components/src
core/packages/components/dist: $(shell find core/packages/components/src -type f)
pnpm --filter @plone/components build

.PHONY: build-deps
Expand Down
2 changes: 1 addition & 1 deletion frontend/mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"package": "@plone/volto",
"url": "git@github.com:plone/volto.git",
"https": "https://github.com/plone/volto.git",
"tag": "18.0.0-alpha.42"
"tag": "18.0.0-alpha.43"
}
}
Loading

0 comments on commit 5356c71

Please sign in to comment.