Compare commits

..

No commits in common. "release" and "main" have entirely different histories.

5 changed files with 14 additions and 14 deletions

View File

@ -130,9 +130,9 @@ spec:
app.kubernetes.io/name: cairn-clickhouse
spec:
securityContext:
runAsUser: {{ APP_USER_ID }}
runAsGroup: {{ APP_USER_ID }}
fsGroup: {{ APP_USER_ID }}
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
fsGroupChangePolicy: "OnRootMismatch"
containers:
- name: cairn-clickhouse
@ -183,8 +183,8 @@ spec:
app.kubernetes.io/name: cairn-superset
spec:
securityContext:
runAsUser: {{ APP_USER_ID }}
runAsGroup: {{ APP_USER_ID }}
runAsUser: 1000
runAsGroup: 1000
containers:
- name: cairn-superset
image: {{ CAIRN_SUPERSET_DOCKER_IMAGE }}
@ -227,8 +227,8 @@ spec:
app.kubernetes.io/name: cairn-superset-worker
spec:
securityContext:
runAsUser: {{ APP_USER_ID }}
runAsGroup: {{ APP_USER_ID }}
runAsUser: 1000
runAsGroup: 1000
containers:
- name: cairn-superset-worker
image: {{ CAIRN_SUPERSET_DOCKER_IMAGE }}
@ -261,8 +261,8 @@ spec:
app.kubernetes.io/name: cairn-superset-worker-beat
spec:
securityContext:
runAsUser: {{ APP_USER_ID }}
runAsGroup: {{ APP_USER_ID }}
runAsUser: 1000
runAsGroup: 1000
containers:
- name: cairn-superset-worker-beat
image: {{ CAIRN_SUPERSET_DOCKER_IMAGE }}

View File

@ -10,8 +10,8 @@ spec:
spec:
restartPolicy: Never
securityContext:
runAsUser: {{ APP_USER_ID }}
runAsGroup: {{ APP_USER_ID }}
runAsUser: 1000
runAsGroup: 1000
containers:
- name: cairn-clickhouse
image: {{ CAIRN_CLICKHOUSE_DOCKER_IMAGE }}

View File

@ -1,6 +1,6 @@
cairn-clickhouse-job:
image: {{ CAIRN_CLICKHOUSE_DOCKER_IMAGE }}
user: "{{ APP_USER_ID }}:{{ APP_USER_ID }}"
user: "1000:1000"
depends_on: {{ [("cairn-clickhouse", CAIRN_RUN_CLICKHOUSE)]|list_if }}
volumes:
- ../plugins/cairn/apps/clickhouse/auth.json:/scripts/clickhouse-auth.json:ro

View File

@ -1,2 +1,2 @@
{% if CAIRN_RUN_CLICKHOUSE %}setowner {{ APP_USER_ID }} /data/cairn-clickhouse{% endif %}
{% if CAIRN_RUN_CLICKHOUSE %}setowner 1000 /data/cairn-clickhouse{% endif %}
{% if CAIRN_RUN_POSTGRESQL %}setowner 70 /data/cairn-postgresql{% endif %}

View File

@ -19,7 +19,7 @@ cairn-clickhouse:
- ../../data/cairn/clickhouse:/var/lib/clickhouse
- ../plugins/cairn/apps/clickhouse/users.d/cairn.xml:/etc/clickhouse-server/users.d/cairn.xml:ro
- ../plugins/cairn/apps/clickhouse/auth.json:/scripts/clickhouse-auth.json:ro
user: "{{ APP_USER_ID }}:{{ APP_USER_ID }}"
user: "1000:1000"
environment:
CLICKHOUSE_DO_NOT_CHOWN: "1"
ulimits: