Skip to content

Commit 075adac

Browse files
committed
SYS-677 wip
1 parent 8a87e72 commit 075adac

11 files changed

Lines changed: 38 additions & 32 deletions

File tree

images/haproxy-keepalived/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM haproxy:3.3.6-alpine
1+
FROM haproxy:3.3.10-alpine
22
ARG BUILD_DATE
33
ARG VCS_REF
44
LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \

images/haproxy-keepalived/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ sources:
77
- https://github.com/haproxy/haproxy
88
- https://github.com/acassen/keepalived
99
type: application
10-
version: 0.1.21
11-
appVersion: "3.3.6-alpine-2.3.4-r3"
10+
version: 0.1.22
11+
appVersion: "3.3.10-alpine-2.3.4-r3"
1212
dependencies:
1313
- name: chartlib
1414
version: 0.1.8

images/mysqldump/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV HOUR=3 MINUTE=30 \
1818
TZ=UTC
1919
ARG UID=210
2020
ARG BACKUP_GID=34
21-
ARG CLIENT_VERSION=11.4.10-r0
21+
ARG CLIENT_VERSION=11.4.11-r0
2222

2323
RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \
2424
[ -z "$RMGROUP" ] || delgroup $RMGROUP && \

images/mysqldump/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- https://github.com/mariadb/server/tree/10.5/client
88
type: application
9-
version: 0.1.16
10-
appVersion: "11.4.10-r0"
9+
version: 0.1.17
10+
appVersion: "11.4.11-r0"
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

images/samba-dc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \
2424
WINBIND_USE_DEFAULT_DOMAIN=yes \
2525
WORKGROUP=AD
2626

27-
ARG SAMBA_VERSION=4.22.8-r0
27+
ARG SAMBA_VERSION=4.22.10-r0
2828

2929
COPY *.conf.j2 /root/
3030
COPY entrypoint.sh /usr/local/bin/

images/samba-dc/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- ttps://gitlab.com/samba-team/samba
88
type: application
9-
version: 0.1.17
10-
appVersion: "4.22.8-r0"
9+
version: 0.1.18
10+
appVersion: "4.22.10-r0"
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

images/samba/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
88
org.label-schema.vcs-ref=$VCS_REF \
99
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
1010

11-
ARG SAMBA_VERSION=4.22.8-r0
11+
ARG SAMBA_VERSION=4.22.10-r0
1212
ENV LOGON_DRIVE=H \
1313
NETBIOS_NAME=samba \
1414
SERVER_STRING="Samba Server" \

images/samba/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- https://gitlab.com/samba-team/samba
88
type: application
9-
version: 0.1.17
10-
appVersion: "4.22.8-r0"
9+
version: 0.1.18
10+
appVersion: "4.22.10-r0"
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

k8s/helm/gitea/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- https://github.com/go-gitea/gitea
88
type: application
9-
version: 0.1.8
10-
appVersion: 1.25.3-rootless
9+
version: 0.1.9
10+
appVersion: 1.26.2-rootless
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

k8s/helm/immich/values.yaml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ tlsHostname: photos.example.com
55
deployment:
66
env:
77
# Note - the documentation of environment variables for immich under docker
8-
# is misleading. Do *not* use those variables under kubernetes, see the
9-
# volume mounts below.
8+
# is misleading. (See https://docs.immich.app/guides/custom-locations/ .)
9+
# Do *not* use those variables under kubernetes, see the volume mounts
10+
# below.
1011
db_database_name: immich
1112
db_hostname: immich-postgres
1213
db_username: immich
13-
# immich_config_file: /config/immich-config.yaml
14-
immich_machine_learning_url: http://k8s00:3003
14+
immich_machine_learning_url: http://immich-ml:3003
1515
immich_watch_filesystem: "no"
16-
# immich_workers_include: api
1716
redis_hostname: immich-valkey
1817
redis_port: 6379
1918
tz: UTC
19+
20+
# Add this if you want to configure via ConfigMap rather than database:
21+
# immich_config_file: /config/immich-config.yaml
2022
xenv:
2123
- name: DB_PASSWORD
2224
valueFrom:
@@ -31,7 +33,8 @@ deployment:
3133
# gid values for video, render
3234
supplementalGroups: [ 44, 891 ]
3335
securityContext:
34-
# TODO define GPU access properly instead of granting excess permissions
36+
# GPU access requires privileges. The alternative is somewhat complicated,
37+
# see https://github.com/UntouchedWagons/K3S-Intel
3538
privileged: true
3639
resources:
3740
limits:
@@ -49,8 +52,8 @@ livenessProbe:
4952
httpGet:
5053
path: /api/server/ping
5154
port: 2283
52-
# Override this with much larger value if "Reindexing clip_index" on startup
53-
initialDelaySeconds: 120
55+
# Override this with much larger value if "Reindexing XXX_index" on startup
56+
initialDelaySeconds: 300
5457
readinessProbe:
5558
httpGet:
5659
path: /api/server/ping
@@ -64,15 +67,17 @@ volumeMounts:
6467
# Manually create the subdirectories you want on the NAS, and chown them
6568
# to the immich user (default above is uid 1000). Here, it's assumed that
6669
# four of the above directories will be subdirectories of an immich
67-
# subdirectory on your NAS photo storage volume. Override the volumeMounts
68-
# if you want a different layout than the one recommended here.
70+
# subdirectory of the primary external-library photo storage volume on your
71+
# NAS. Define the top-level NAS volume as an nfs-client PVC 'pictures' before
72+
# applying this helm chart. Override the volumeMounts if you want a different
73+
# layout than the one recommended here.
6974
- name: ssd
7075
mountPath: /data
7176
subPath: html
7277
- name: config
7378
mountPath: /config/immich-config.yaml
7479
subPath: immich-config.yaml
75-
- name: dri
80+
- name: gpu
7681
mountPath: /dev/dri
7782
- name: nas
7883
mountPath: /mnt/photos
@@ -107,11 +112,12 @@ volumes:
107112
- name: config
108113
configMap:
109114
name: immich
110-
- name: ssd
111-
hostPath: { path: /var/lib/docker/k8s-volumes/immich }
112-
- name: dri
115+
optional: true
116+
- name: gpu
113117
hostPath:
114118
path: /dev/dri
119+
- name: ssd
120+
hostPath: { path: /var/lib/docker/k8s-volumes/immich }
115121
- name: nas
116122
persistentVolumeClaim:
117123
claimName: pictures
@@ -152,6 +158,7 @@ autoscaling:
152158

153159
configmap:
154160
name: immich
161+
enabled: false
155162
data:
156163
immich-config.yaml: |
157164
# Add custom settings here
@@ -187,7 +194,6 @@ postgres:
187194
- name: immich-config
188195
configMap:
189196
name: immich
190-
psqlTag: 17.7
191197
image:
192198
repository: ghcr.io/immich-app/postgres
193199
tag: 17-vectorchord0.5.3-pgvector0.8.1
@@ -197,4 +203,4 @@ ml:
197203
image:
198204
tag: v2.7.5
199205
env:
200-
immich_log_level: debug
206+
immich_log_level: info

0 commit comments

Comments
 (0)