Skip to content
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.

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

feat: upgrade to CMP 8.0.6 #44

Open
wants to merge 1 commit into
base: newproject
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions cms/conf.d/include.conf

This file was deleted.

6 changes: 6 additions & 0 deletions cms/conf.d/include.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include_conf_files:
directory: "include"
files:
- devtools.yml
- features.yml
- fileupdload.yml
1 change: 0 additions & 1 deletion cms/conf.d/include/alohaeditor.conf

This file was deleted.

4 changes: 0 additions & 4 deletions cms/conf.d/include/devtools.conf

This file was deleted.

4 changes: 4 additions & 0 deletions cms/conf.d/include/devtools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
devtools:
synchronizer:
class: "com.gentics.contentnode.devtools.FileMonitorWatcher"
interval: 100
17 changes: 0 additions & 17 deletions cms/conf.d/include/features.conf

This file was deleted.

19 changes: 19 additions & 0 deletions cms/conf.d/include/features.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
feature:
mesh_contentrepository: true
pub_dir_segment: true
devtools: true
activiti_integration: true
aloha_annotate_editables: true
live_urls: true
resumable_publish_process: true
customform_resolve_nodetags: true
force_javaparser_post: true
copy_tags: true
nice_urls: true
contentgroup3_pagefilename: true
contentfile_auto_offline: true
publish_cache: true
content_staging: true
packages: true
file_fetch: true
objtag_sync: true
4 changes: 0 additions & 4 deletions cms/conf.d/include/fileupload.conf

This file was deleted.

5 changes: 5 additions & 0 deletions cms/conf.d/include/fileupload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
max_filesize: "4G"
no_max_filesize:
- "Node Super Admin"
- "Editor"
- "Node Admin"
6 changes: 3 additions & 3 deletions docker-compose.override.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ services:

cms:
ports:
- '8082:80'
- '8082:8080'
environment:
LICENSEKEY: TH1S-15N0-T4V4-L1DK-3YKT-HXBY-D34D-B33F
volumes:
- ./cms/dumps:/Node/etc/dumps
- ./portal/public/static/demo-assets/files:/Node/node/content/packages/demo-assets/files:ro
- ./portal/public/static/demo-assets/files:/cms/packages/demo-assets/files:ro
- ./cms/content-packages:/cms/content-packages

# Optional: Language Tool
# To enable, please comment out the entrypoint line!
Expand Down
30 changes: 14 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
services:

portal:
image: gentics-portal-php
build:
Expand All @@ -16,7 +15,7 @@ services:
deploy:
resources:
limits:
cpus: '1'
cpus: "1"
memory: 768M

# https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
Expand All @@ -43,13 +42,13 @@ services:
deploy:
resources:
limits:
cpus: '0.5'
cpus: "0.5"
memory: 1G

# https://hub.docker.com/r/gentics/mesh/
mesh:
# https://getmesh.io/docs/administration-guide.html#_environment_variables
image: docker.apa-it.at/gentics/mesh:1.8.11
image: docker.apa-it.at/gentics/mesh:2.0.5
volumes:
- mesh-data:/mesh/data
- mesh-config:/config
Expand All @@ -72,31 +71,30 @@ services:
deploy:
resources:
limits:
cpus: '0.5'
cpus: "0.5"
memory: 1G

# https://hub.docker.com/r/gentics/cms/
cms:
image: docker.apa-it.at/gentics/cms:5.44.5
image: docker.apa-it.at/gentics/cms:6.0.6
restart: on-failure
volumes:
- cms-node:/Node/node
- cms-dbfiles:/Node/node/content/dbfiles
- cms-bundles:/Node/node/system/bundles
- ./cms/conf.d/include.conf:/Node/etc/conf.d/include.conf
- ./cms/conf.d/include:/Node/etc/conf.d/include
- cms-bundles:/cms/system/bundles
- cms-dbfiles:/cms/data/dbfiles
- ./cms/conf.d/include:/cms/conf/include
environment:
JAVA_XMS: 512m
JAVA_XMX: 512m
NODE_DB_USER: root
NODE_DB_PASSWORD: ""
NODE_DB_HOST: db
NODE_USER_PASSWORD: node
CONF_FILES: include

deploy:
resources:
limits:
cpus: '1'
cpus: "1"
memory: 1G

# https://hub.docker.com/_/mariadb/
Expand All @@ -110,11 +108,11 @@ services:
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_ROOT_PASSWORD: ""

deploy:
resources:
limits:
cpus: '0.5'
cpus: "0.5"
memory: 512M

# Optional: Language tool
Expand All @@ -127,7 +125,7 @@ services:
deploy:
resources:
limits:
cpus: '0.25'
cpus: "0.25"
memory: 192M

# Optional: Keycloak
Expand All @@ -147,7 +145,7 @@ services:
deploy:
resources:
limits:
cpus: '0.5'
cpus: "0.5"
memory: 768M

volumes:
Expand Down
2 changes: 1 addition & 1 deletion portal-files/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm-bullseye
FROM php:8.2-fpm-bullseye

# Install Debian packages
RUN apt-get update -y \
Expand Down