feat: remove Docker socket dependency from SaaS layer
- Remove docker-java-core and docker-java-transport-zerodep from pom.xml - Remove Docker socket mount, group_add, jardata volume from docker-compose.yml - Remove CAMELEER_DOCKER_NETWORK and CLICKHOUSE_URL env vars from SaaS service - Remove jardata volume definition Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -133,16 +133,12 @@ services:
|
|||||||
cameleer-saas:
|
cameleer-saas:
|
||||||
image: ${CAMELEER_IMAGE:-gitea.siegeln.net/cameleer/cameleer-saas}:${VERSION:-latest}
|
image: ${CAMELEER_IMAGE:-gitea.siegeln.net/cameleer/cameleer-saas}:${VERSION:-latest}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
group_add:
|
|
||||||
- "0"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
logto-bootstrap:
|
logto-bootstrap:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
|
||||||
- jardata:/data/jars
|
|
||||||
- bootstrapdata:/data/bootstrap:ro
|
- bootstrapdata:/data/bootstrap:ro
|
||||||
environment:
|
environment:
|
||||||
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas}
|
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas}
|
||||||
@@ -155,9 +151,6 @@ services:
|
|||||||
LOGTO_M2M_CLIENT_ID: ${LOGTO_M2M_CLIENT_ID:-}
|
LOGTO_M2M_CLIENT_ID: ${LOGTO_M2M_CLIENT_ID:-}
|
||||||
LOGTO_M2M_CLIENT_SECRET: ${LOGTO_M2M_CLIENT_SECRET:-}
|
LOGTO_M2M_CLIENT_SECRET: ${LOGTO_M2M_CLIENT_SECRET:-}
|
||||||
CAMELEER3_SERVER_ENDPOINT: http://cameleer3-server:8081
|
CAMELEER3_SERVER_ENDPOINT: http://cameleer3-server:8081
|
||||||
CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token}
|
|
||||||
CAMELEER_DOCKER_NETWORK: ${COMPOSE_PROJECT_NAME:-cameleer-saas}_cameleer
|
|
||||||
CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.http.routers.saas.rule=PathPrefix(`/platform`)
|
- traefik.http.routers.saas.rule=PathPrefix(`/platform`)
|
||||||
@@ -243,5 +236,4 @@ volumes:
|
|||||||
pgdata:
|
pgdata:
|
||||||
chdata:
|
chdata:
|
||||||
certs:
|
certs:
|
||||||
jardata:
|
|
||||||
bootstrapdata:
|
bootstrapdata:
|
||||||
|
|||||||
12
pom.xml
12
pom.xml
@@ -80,18 +80,6 @@
|
|||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Docker Java client -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.docker-java</groupId>
|
|
||||||
<artifactId>docker-java-core</artifactId>
|
|
||||||
<version>3.4.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.docker-java</groupId>
|
|
||||||
<artifactId>docker-java-transport-zerodep</artifactId>
|
|
||||||
<version>3.4.1</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Test -->
|
<!-- Test -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|||||||
Reference in New Issue
Block a user