references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-13 19:20:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge-release/17.2-20260318041917

Browse Source
This commit is contained in:
Klaus Zanders
2026-03-18 08:30:59 +01:00
committed by GitHub
parent c980dee8c8 3db042cc5c
commit cda493946c
604 changed files with 17319 additions and 4415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/dev/backend/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:3.4.7-trixie AS develop
FROM ruby:4.0.1-trixie AS develop
LABEL org.opencontainers.image.authors="operations@openproject.com"
ARG DEV_UID=1000
docker/dev/hocuspocus/docker-compose.yml
+1 -2
View File
@@ -2,7 +2,7 @@ services:
hocuspocus:
# In case of MacOS you need to specify the platform in your `docker/dev/hocuspocus/docker-compose.override.yml`:
# platform: linux/amd64
image: openproject/hocuspocus:latest
image: openproject/hocuspocus:dev-latest
labels:
- "traefik.enable=true"
- "traefik.http.routers.hocuspocus.rule=Host(`hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
@@ -14,7 +14,6 @@ services:
networks:
- gateway
environment:
- ALLOWED_DOMAINS=openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local},localhost
- NODE_TLS_REJECT_UNAUTHORIZED=0
- SECRET=secret12345
networks:
docker/dev/tls/docker-compose.yml
+1
View File
@@ -17,6 +17,7 @@ services:
- openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- nextcloud.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- xwiki.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- gitlab.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD:-local}
docker/prod/Dockerfile
+2 -1
View File
@@ -1,4 +1,5 @@
ARG RUBY_VERSION="3.4.7"
ARG RUBY_VERSION="4.0.1"
ARG DEBIAN_BASE="trixie"
# Add SBOM scan context for intermediate steps
ARG BUILDKIT_SBOM_SCAN_CONTEXT=true
ARG BUILDKIT_SBOM_SCAN_STAGE=true