Revert "Add private mirror support for OCI references #4362"

This reverts commit f9e78ba35e.
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2024-03-20 17:09:41 +01:00
parent dac6b57e0a
commit 33eb9c99ea
13 changed files with 24 additions and 28 deletions

View file

@ -26,7 +26,7 @@ spec:
spec:
initContainers:
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -50,7 +50,7 @@ spec:
- name: COLLABORA_HOST
value: nextcloud-aio-collabora
- name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"FF
value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_HOST
value: nextcloud-aio-nextcloud
- name: NOTIFY_PUSH_HOST
@ -61,7 +61,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-apache:20240308_092935-latest"
image: nextcloud/aio-apache:20240308_092935-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View file

@ -27,7 +27,7 @@ spec:
spec:
initContainers:
- name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- mkdir
- "-p"
@ -37,7 +37,7 @@ spec:
- name: nextcloud-aio-clamav
mountPath: /nextcloud-aio-clamav
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chown
- 100:100
@ -52,7 +52,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-clamav:20240308_092935-latest"
image: nextcloud/aio-clamav:20240308_092935-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View file

@ -37,7 +37,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-collabora:20240308_092935-latest"
image: nextcloud/aio-collabora:20240308_092935-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980

View file

@ -26,7 +26,7 @@ spec:
spec:
initContainers:
- name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- mkdir
- "-p"
@ -39,7 +39,7 @@ spec:
- name: nextcloud-aio-database
mountPath: /nextcloud-aio-database
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chown
- 999:999
@ -63,7 +63,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-postgresql:20240308_092935-latest"
image: nextcloud/aio-postgresql:20240308_092935-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View file

@ -27,7 +27,7 @@ spec:
spec:
initContainers:
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -57,7 +57,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-fulltextsearch:20240308_092935-latest"
image: nextcloud/aio-fulltextsearch:20240308_092935-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View file

@ -27,7 +27,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-imaginary:20240308_092935-latest"
image: nextcloud/aio-imaginary:20240308_092935-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View file

@ -26,7 +26,7 @@ spec:
spec:
initContainers:
- name: "delete-lost-found"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- rm
- "-rf"
@ -37,7 +37,7 @@ spec:
- name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -160,7 +160,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-nextcloud:20240308_092935-latest"
image: nextcloud/aio-nextcloud:20240308_092935-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View file

@ -26,7 +26,7 @@ spec:
spec:
initContainers:
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -52,7 +52,7 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-notify-push:20240308_092935-latest"
image: nextcloud/aio-notify-push:20240308_092935-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867

View file

@ -27,7 +27,7 @@ spec:
spec:
initContainers:
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -45,7 +45,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-onlyoffice:20240308_092935-latest"
image: nextcloud/aio-onlyoffice:20240308_092935-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View file

@ -26,7 +26,7 @@ spec:
spec:
initContainers:
- name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
image: alpine
command:
- chmod
- "777"
@ -40,7 +40,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-redis:20240308_092935-latest"
image: nextcloud/aio-redis:20240308_092935-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View file

@ -37,7 +37,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-talk:20240308_092935-latest"
image: nextcloud/aio-talk:20240308_092935-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View file

@ -33,7 +33,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG}}/aio-talk-recording:20240308_092935-latest"
image: nextcloud/aio-talk-recording:20240308_092935-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234

View file

@ -10,10 +10,6 @@ TALK_INTERNAL_SECRET: # TODO! This needs to be a unique and good passw
TIMEZONE: Europe/Berlin # TODO! This is the timezone that your containers will use.
TURN_SECRET: # TODO! This needs to be a unique and good password!
IMAGE_MIRROR_PREFIX: # Setting this allows you to pull Nextcloud images through a mirror registry.
NEXTCLOUD_IMAGE_ORG: "nextcloud" # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons.
ALPINE_IMAGE_ORG: # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons.
CLAMAV_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
COLLABORA_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
FULLTEXTSEARCH_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.