Merge pull request #1 from kitconcept/renametowebsite

Renaming and upgrading to core 1a22

Author: ericof

.github/workflows/changelog.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   NODE_VERSION: 22.x
-  ADDON_NAME: volto-site
+  ADDON_NAME: website
   BASE_BRANCH: main
 
 jobs:

.github/workflows/config.yml

@@ -1,4 +1,4 @@
-name: 'kitconcept-site: Compute Config variables'
+name: 'kitconcept-website: Compute Config variables'
 
 on:
   workflow_call:
@@ -21,7 +21,7 @@ on:
       image-name-prefix:
         required: false
         type: string
-        default: "ghcr.io/kitconcept/kitconcept-site"
+        default: "ghcr.io/kitconcept/kitconcept-website"
       node-version:
         required: false
         type: string

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: "kitconcept.site: CI"
+name: "kitconcept.website: CI"
 
 on:
   push:

.github/workflows/manual_deploy.yml

@@ -1,4 +1,4 @@
-name: "kitconcept-site: Manual Deploy"
+name: "kitconcept-website: Manual Deploy"
 
 on:
   workflow_dispatch:

Makefile

@@ -11,9 +11,9 @@ MAKEFLAGS+=--no-builtin-rules
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 GIT_FOLDER=$(CURRENT_DIR)/.git
 
-PROJECT_NAME=kitconcept-site
+PROJECT_NAME=kitconcept-website
 STACK_FILE=docker-compose-dev.yml
-STACK_HOSTNAME=kitconcept-site.localhost
+STACK_HOSTNAME=kitconcept-website.localhost
 
 VOLTO_VERSION = $(shell cat frontend/mrs.developer.json | python -c "import sys, json; print(json.load(sys.stdin)['core']['tag'])")
 KC_VERSION=$(shell cat backend/version.txt)
@@ -133,7 +133,7 @@ build-images:  ## Build docker images
 stack-start:  ## Local Stack: Start Services
 	@echo "Start local Docker stack"
 	VOLTO_VERSION=$(VOLTO_VERSION) KC_VERSION=$(KC_VERSION) docker compose -f $(STACK_FILE) up -d --build
-	@echo "Now visit: http://kitconcept-site.localhost"
+	@echo "Now visit: http://kitconcept-website.localhost"
 
 .PHONY: start-stack
 stack-create-site:  ## Local Stack: Create a new site
@@ -177,12 +177,12 @@ acceptance-test: ## Start Acceptance tests in interactive mode
 .PHONY: acceptance-frontend-image-build
 acceptance-frontend-image-build: ## Build Acceptance frontend server image
 	@echo "Build acceptance frontend"
-	@docker build frontend -t kitconcept/kitconcept-site-frontend:acceptance -f frontend/Dockerfile --build-arg VOLTO_VERSION=$(VOLTO_VERSION)
+	@docker build frontend -t kitconcept/kitconcept-website-frontend:acceptance -f frontend/Dockerfile --build-arg VOLTO_VERSION=$(VOLTO_VERSION)
 
 .PHONY: acceptance-backend-image-build
 acceptance-backend-image-build: ## Build Acceptance backend server image
 	@echo "Build acceptance backend"
-	@docker build backend -t kitconcept/kitconcept-site-backend:acceptance -f backend/Dockerfile.acceptance --build-arg KC_VERSION=$(KC_VERSION)
+	@docker build backend -t kitconcept/kitconcept-website-backend:acceptance -f backend/Dockerfile.acceptance --build-arg KC_VERSION=$(KC_VERSION)
 
 .PHONY: acceptance-images-build
 acceptance-images-build: ## Build Acceptance frontend/backend images
@@ -192,12 +192,12 @@ acceptance-images-build: ## Build Acceptance frontend/backend images
 .PHONY: acceptance-frontend-container-start
 acceptance-frontend-container-start: ## Start Acceptance frontend container
 	@echo "Start acceptance frontend"
-	@docker run --rm -p 3000:3000 --name kitconcept-site-frontend-acceptance --link kitconcept-site-backend-acceptance:backend -e RAZZLE_API_PATH=http://localhost:55001/plone -e RAZZLE_INTERNAL_API_PATH=http://backend:55001/plone -d kitconcept/kitconcept-site-frontend:acceptance
+	@docker run --rm -p 3000:3000 --name kitconcept-website-frontend-acceptance --link kitconcept-website-backend-acceptance:backend -e RAZZLE_API_PATH=http://localhost:55001/plone -e RAZZLE_INTERNAL_API_PATH=http://backend:55001/plone -d kitconcept/kitconcept-website-frontend:acceptance
 
 .PHONY: acceptance-backend-container-start
 acceptance-backend-container-start: ## Start Acceptance backend container
 	@echo "Start acceptance backend"
-	@docker run --rm -p 55001:55001 --name kitconcept-site-backend-acceptance -d kitconcept/kitconcept-site-backend:acceptance
+	@docker run --rm -p 55001:55001 --name kitconcept-website-backend-acceptance -d kitconcept/kitconcept-website-backend:acceptance
 
 .PHONY: acceptance-containers-start
 acceptance-containers-start: ## Start Acceptance containers
@@ -207,8 +207,8 @@ acceptance-containers-start: ## Start Acceptance containers
 .PHONY: acceptance-containers-stop
 acceptance-containers-stop: ## Stop Acceptance containers
 	@echo "Stop acceptance containers"
-	@docker stop kitconcept-site-frontend-acceptance
-	@docker stop kitconcept-site-backend-acceptance
+	@docker stop kitconcept-website-frontend-acceptance
+	@docker stop kitconcept-website-backend-acceptance
 
 .PHONY: ci-acceptance-test
 ci-acceptance-test: ## Run Acceptance tests in ci mode

README.md

@@ -1,7 +1,7 @@
 # kitconcept Site 🚀
 
 [![Built with Cookieplone](https://img.shields.io/badge/built%20with-Cookieplone-0083be.svg?logo=cookiecutter)](https://github.com/plone/cookiecutter-plone/)
-[![Tests](https://github.com/kitconcept/kitconcept-site/actions/workflows/main.yml/badge.svg)](https://github.com/kitconcept/kitconcept-site/actions/workflows/main.yml)
+[![Tests](https://github.com/kitconcept/kitconcept-website/actions/workflows/main.yml/badge.svg)](https://github.com/kitconcept/kitconcept-website/actions/workflows/main.yml)
 
 A CMS solution for public websites. Created by kitconcept.
 
@@ -21,8 +21,8 @@ Ensure you have the following installed:
 1. Clone the repository:
 
 ```shell
-git clone git@github.com:kitconcept/kitconcept-site.git
-cd kitconcept.site
+git clone git@github.com:kitconcept/kitconcept-website.git
+cd kitconcept.website
 ```
 
 2. Install both Backend and Frontend:
@@ -94,7 +94,7 @@ Deploy a local `Docker Compose` environment that includes:
 
 - Docker images for Backend and Frontend 🖼️
 - A stack with a Traefik router and a Postgres database 🗃️
-- Accessible at [http://kitconcept.site.localhost](http://kitconcept.site.localhost) 🌐
+- Accessible at [http://kitconcept.website.localhost](http://kitconcept.website.localhost) 🌐
 
 Execute the following:
 
@@ -109,7 +109,7 @@ And... you're all set! Your Plone site is up and running locally! 🚀
 
 This monorepo consists of three distinct sections: `backend`, `frontend`, and `devops`.
 
-- **backend**: Houses the API and Plone installation, utilizing pip instead of buildout, and includes a policy package named kitconcept.site.
+- **backend**: Houses the API and Plone installation, utilizing pip instead of buildout, and includes a policy package named kitconcept.website.
 - **frontend**: Contains the React (Volto) package.
 - **devops**: Encompasses Docker Stack, Ansible playbooks, and Cache settings.
 

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.9
-ARG KC_VERSION
+ARG KC_VERSION=latest
 FROM ghcr.io/kitconcept/core-builder:${KC_VERSION:-latest} AS builder
 
 # Move skeleton folder
@@ -46,11 +46,11 @@ EOT
 FROM ghcr.io/kitconcept/core-prod:${KC_VERSION:-latest}
 
 LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
-      org.label-schema.name="ghcr.io/kitconcept/kitconcept-site-backend" \
+      org.label-schema.name="ghcr.io/kitconcept/kitconcept-website-backend" \
       org.label-schema.description="A CMS solution for public websites. Created by kitconcept." \
       org.label-schema.vendor="kitconcept GmbH"
 
-ENV ALLOWED_DISTRIBUTIONS=kitconcept-site
+ENV ALLOWED_DISTRIBUTIONS=kitconcept-website
 
 # Copy the pre-built `/app` directory to the runtime container
 # and change the ownership to user app and group app in one step.

backend/Dockerfile.acceptance

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG KC_VERSION=6.1.0
+ARG KC_VERSION=latest
 FROM plone/server-builder:${KC_VERSION} AS builder
 
 WORKDIR /app
@@ -26,12 +26,12 @@ EOT
 FROM plone/server-acceptance:${KC_VERSION}
 
 LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
-      org.label-schema.name="kitconcept.site-acceptance" \
+      org.label-schema.name="kitconcept.website-acceptance" \
       org.label-schema.description="kitconcept Site backend acceptance image." \
       org.label-schema.vendor="kitconcept GmbH"
 
-ENV CONFIGURE_PACKAGES="plone.restapi,plone.volto,plone.volto.cors,kitconcept.site"
-ENV APPLY_PROFILES="kitconcept.site:default"
+ENV CONFIGURE_PACKAGES="plone.restapi,plone.volto,plone.volto.cors,kitconcept.website"
+ENV APPLY_PROFILES="kitconcept.website:default"
 
 # Copy /app from builder
 COPY --from=builder /app /app

backend/Dockerfile.beispiele

@@ -1,17 +1,17 @@
 # syntax=docker/dockerfile:1
-ARG IMAGE_TAG
+ARG IMAGE_TAG=latest
 ARG SEED=1000
-FROM ghcr.io/kitconcept/kitconcept-site-backend:${IMAGE_TAG:-latest}
+FROM ghcr.io/kitconcept/kitconcept-website-backend:${IMAGE_TAG:-latest}
 
 LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
-      org.label-schema.name="ghcr.io/kitconcept/kitconcept-site-beispiele" \
+      org.label-schema.name="ghcr.io/kitconcept/kitconcept-website-beispiele" \
       org.label-schema.description="A CMS solution for public websites. Created by kitconcept." \
       org.label-schema.vendor="kitconcept GmbH"
 
 # Disable MO Compilation
 ENV zope_i18n_compile_mo_files=
 # Show only our distributions
-ENV ALLOWED_DISTRIBUTIONS=kitconcept-site
+ENV ALLOWED_DISTRIBUTIONS=kitconcept-website
 
 # Increase Upload limit to 6MB
 ENV ZOPE_FORM_MEMORY_LIMIT=6MB

backend/LICENSE.md

@@ -1,4 +1,4 @@
-kitconcept.site Copyright 2023, kitconcept GmbH
+kitconcept.website Copyright 2023, kitconcept GmbH
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 2