From d286207b9f42843208bc2733f356ee7232e87a02 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Fri, 27 Sep 2024 11:54:16 +0200 Subject: [PATCH] Remove version from all Compose files, remove charts --- apps/leafcutter/.storybook/main.js | 27 -------- apps/leafcutter/.storybook/preview.js | 30 --------- apps/leafcutter/charts/.helmignore | 23 ------- apps/leafcutter/charts/Chart.yaml | 6 -- apps/leafcutter/charts/templates/NOTES.txt | 22 ------- apps/leafcutter/charts/templates/_helpers.tpl | 62 ----------------- .../charts/templates/deployment.yaml | 66 ------------------- apps/leafcutter/charts/templates/hpa.yaml | 28 -------- apps/leafcutter/charts/templates/ingress.yaml | 61 ----------------- apps/leafcutter/charts/templates/service.yaml | 15 ----- .../charts/templates/serviceaccount.yaml | 12 ---- .../templates/tests/test-connection.yaml | 15 ----- apps/leafcutter/charts/values.yaml | 43 ------------ docker/compose/bridge.yml | 14 ---- docker/compose/leafcutter.yml | 2 - docker/compose/link.yml | 2 - docker/compose/opensearch.yml | 2 - docker/compose/postgresql.yml | 15 ----- docker/compose/zammad.yml | 2 - 19 files changed, 447 deletions(-) delete mode 100644 apps/leafcutter/.storybook/main.js delete mode 100644 apps/leafcutter/.storybook/preview.js delete mode 100644 apps/leafcutter/charts/.helmignore delete mode 100644 apps/leafcutter/charts/Chart.yaml delete mode 100644 apps/leafcutter/charts/templates/NOTES.txt delete mode 100644 apps/leafcutter/charts/templates/_helpers.tpl delete mode 100644 apps/leafcutter/charts/templates/deployment.yaml delete mode 100644 apps/leafcutter/charts/templates/hpa.yaml delete mode 100644 apps/leafcutter/charts/templates/ingress.yaml delete mode 100644 apps/leafcutter/charts/templates/service.yaml delete mode 100644 apps/leafcutter/charts/templates/serviceaccount.yaml delete mode 100644 apps/leafcutter/charts/templates/tests/test-connection.yaml delete mode 100644 apps/leafcutter/charts/values.yaml diff --git a/apps/leafcutter/.storybook/main.js b/apps/leafcutter/.storybook/main.js deleted file mode 100644 index dfb3e84..0000000 --- a/apps/leafcutter/.storybook/main.js +++ /dev/null @@ -1,27 +0,0 @@ -const path = require("path"); -const toPath = (filePath) => path.join(process.cwd(), filePath); - -module.exports = { - stories: [ - "../stories/**/*.stories.mdx", - "../stories/**/*.stories.@(js|jsx|ts|tsx)", - ], - addons: [ - "@storybook/addon-docs", - "@storybook/addon-links", - "@storybook/addon-essentials", - ], - webpackFinal: async (config) => { - return { - ...config, - resolve: { - ...config.resolve, - alias: { - ...config.resolve.alias, - "@emotion/core": toPath("node_modules/@emotion/react"), - "emotion-theming": toPath("node_modules/@emotion/react"), - }, - }, - }; - }, -}; diff --git a/apps/leafcutter/.storybook/preview.js b/apps/leafcutter/.storybook/preview.js deleted file mode 100644 index 71f4c6c..0000000 --- a/apps/leafcutter/.storybook/preview.js +++ /dev/null @@ -1,30 +0,0 @@ -import { AppProvider } from "../components/common/AppProvider"; -import { I18n } from "react-polyglot"; -import en from "../locales/en.json"; -import "@fontsource/roboto/400.css"; -import "@fontsource/poppins/400.css"; -import "@fontsource/poppins/700.css"; -import "@fontsource/playfair-display/900.css"; - -const locale = "en"; -const messages = { en }; - -export const decorators = [ - (Story) => ( - - - - - - ), -]; - -export const parameters = { - actions: { argTypesRegex: "^on[A-Z].*" }, - controls: { - matchers: { - color: /(background|color)$/i, - date: /Date$/, - }, - }, -}; diff --git a/apps/leafcutter/charts/.helmignore b/apps/leafcutter/charts/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/apps/leafcutter/charts/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/apps/leafcutter/charts/Chart.yaml b/apps/leafcutter/charts/Chart.yaml deleted file mode 100644 index 8ae83e9..0000000 --- a/apps/leafcutter/charts/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: leafcutter -description: A Helm chart for Kubernetes -type: application -version: 0.2.0 -appVersion: "0.2.0" diff --git a/apps/leafcutter/charts/templates/NOTES.txt b/apps/leafcutter/charts/templates/NOTES.txt deleted file mode 100644 index 97dd3a9..0000000 --- a/apps/leafcutter/charts/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "charts.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "charts.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "charts.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "charts.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/apps/leafcutter/charts/templates/_helpers.tpl b/apps/leafcutter/charts/templates/_helpers.tpl deleted file mode 100644 index 68f9e0e..0000000 --- a/apps/leafcutter/charts/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "charts.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "charts.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "charts.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "charts.labels" -}} -helm.sh/chart: {{ include "charts.chart" . }} -{{ include "charts.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "charts.selectorLabels" -}} -app.kubernetes.io/name: {{ include "charts.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "charts.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "charts.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/apps/leafcutter/charts/templates/deployment.yaml b/apps/leafcutter/charts/templates/deployment.yaml deleted file mode 100644 index 27a1e98..0000000 --- a/apps/leafcutter/charts/templates/deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "charts.fullname" . }} - labels: - {{- include "charts.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "charts.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "charts.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "charts.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - {{- range .Values.env }} - - name: {{ .name }} - value: {{ .value }} - {{- end }} - ports: - - name: http - containerPort: 3000 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/apps/leafcutter/charts/templates/hpa.yaml b/apps/leafcutter/charts/templates/hpa.yaml deleted file mode 100644 index 7138f1d..0000000 --- a/apps/leafcutter/charts/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "charts.fullname" . }} - labels: - {{- include "charts.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "charts.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/apps/leafcutter/charts/templates/ingress.yaml b/apps/leafcutter/charts/templates/ingress.yaml deleted file mode 100644 index 9e8eeb1..0000000 --- a/apps/leafcutter/charts/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "charts.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "charts.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/apps/leafcutter/charts/templates/service.yaml b/apps/leafcutter/charts/templates/service.yaml deleted file mode 100644 index 1b5a178..0000000 --- a/apps/leafcutter/charts/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "charts.fullname" . }} - labels: - {{- include "charts.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "charts.selectorLabels" . | nindent 4 }} diff --git a/apps/leafcutter/charts/templates/serviceaccount.yaml b/apps/leafcutter/charts/templates/serviceaccount.yaml deleted file mode 100644 index 9397ca7..0000000 --- a/apps/leafcutter/charts/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "charts.serviceAccountName" . }} - labels: - {{- include "charts.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/apps/leafcutter/charts/templates/tests/test-connection.yaml b/apps/leafcutter/charts/templates/tests/test-connection.yaml deleted file mode 100644 index f482848..0000000 --- a/apps/leafcutter/charts/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "charts.fullname" . }}-test-connection" - labels: - {{- include "charts.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "charts.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/apps/leafcutter/charts/values.yaml b/apps/leafcutter/charts/values.yaml deleted file mode 100644 index 8dc2c6d..0000000 --- a/apps/leafcutter/charts/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -replicaCount: 1 - -image: - repository: registry.gitlab.com/digiresilience/link/link-stack/leafcutter - pullPolicy: IfNotPresent - tag: "main" - -imagePullSecrets: [] - -nameOverride: "" - -fullnameOverride: "" - -env: [] - -serviceAccount: - create: true - annotations: {} - name: "" - -podAnnotations: {} - -podSecurityContext: {} - -securityContext: {} - -service: - type: ClusterIP - port: 3000 - -ingress: - enabled: false - -resources: {} - -autoscaling: - enabled: false - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/docker/compose/bridge.yml b/docker/compose/bridge.yml index eb8ea38..696c1f6 100644 --- a/docker/compose/bridge.yml +++ b/docker/compose/bridge.yml @@ -1,5 +1,3 @@ -version: "3.4" - x-global-vars: &common-global-variables TZ: Etc/UTC @@ -10,28 +8,16 @@ x-bridge-vars: &common-bridge-variables DATABASE_ROOT_PASSWORD: ${BRIDGE_DATABASE_ROOT_PASSWORD} DATABASE_OWNER: "bridge" DATABASE_PASSWORD: ${BRIDGE_DATABASE_PASSWORD} - DATABASE_VISITOR: "app_visitor" - DATABASE_AUTHENTICATOR: "app_graphile_auth" - DATABASE_AUTHENTICATOR_PASSWORD: ${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD} DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge" WORKER_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge" SHADOW_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge_shadow" ROOT_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/template1" APP_ROOT_DATABASE_URL: "postgresql://root:${BRIDGE_DATABASE_ROOT_PASSWORD}@bridge-postgresql/bridge" DATABASE_AUTH_URL: "postgresql://app_graphile_auth:${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD}@bridge-postgresql/bridge" - CORS_ALLOWED_ORIGINS: "https://bridge-api,${BRIDGE_DOMAIN},http://localhost:3000,http://127.0.0.1:3000" FRONTEND_URL: ${BRIDGE_DOMAIN} API_URL: "http://bridge-api:3001" NEXTAUTH_URL: ${BRIDGE_DOMAIN} NEXTAUTH_SECRET: ${NEXTAUTH_SECRET} - NEXTAUTH_AUDIENCE: ${NEXTAUTH_AUDIENCE} - NEXTAUTH_SIGNING_KEY_B64: ${NEXTAUTH_SIGNING_KEY_B64} - NEXTAUTH_ENCRYPTION_KEY_B64: ${NEXTAUTH_ENCRYPTION_KEY_B64} - GITLAB_EMAIL_ADDRESS: ${GITLAB_EMAIL_ADDRESS} - GITLAB_ID: ${GITLAB_ID} - GITLAB_SECRET: ${GITLAB_SECRET} - SIGNALD_ENABLED: "true" - SIGNALD_SOCKET: /signald/signald.sock services: bridge-frontend: diff --git a/docker/compose/leafcutter.yml b/docker/compose/leafcutter.yml index b309ea1..52082bd 100644 --- a/docker/compose/leafcutter.yml +++ b/docker/compose/leafcutter.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: leafcutter: container_name: leafcutter diff --git a/docker/compose/link.yml b/docker/compose/link.yml index 98ce00e..9837110 100644 --- a/docker/compose/link.yml +++ b/docker/compose/link.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: link: container_name: link diff --git a/docker/compose/opensearch.yml b/docker/compose/opensearch.yml index c88b18c..b8f0039 100644 --- a/docker/compose/opensearch.yml +++ b/docker/compose/opensearch.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: opensearch: container_name: opensearch diff --git a/docker/compose/postgresql.yml b/docker/compose/postgresql.yml index c59107b..0849f99 100644 --- a/docker/compose/postgresql.yml +++ b/docker/compose/postgresql.yml @@ -1,5 +1,3 @@ -version: "3.4" - x-global-vars: &common-global-variables TZ: Etc/UTC @@ -24,28 +22,15 @@ x-bridge-vars: &common-bridge-variables DATABASE_ROOT_PASSWORD: ${BRIDGE_DATABASE_ROOT_PASSWORD} DATABASE_OWNER: "bridge" DATABASE_PASSWORD: ${BRIDGE_DATABASE_PASSWORD} - DATABASE_VISITOR: "app_visitor" - DATABASE_AUTHENTICATOR: "app_graphile_auth" - DATABASE_AUTHENTICATOR_PASSWORD: ${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD} DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge" WORKER_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge" SHADOW_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge_shadow" ROOT_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/template1" - APP_ROOT_DATABASE_URL: "postgresql://root:${BRIDGE_DATABASE_ROOT_PASSWORD}@bridge-postgresql/bridge" DATABASE_AUTH_URL: "postgresql://app_graphile_auth:${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD}@bridge-postgresql/bridge" - CORS_ALLOWED_ORIGINS: "https://bridge-api,${BRIDGE_DOMAIN},http://localhost:3000,http://127.0.0.1:3000" FRONTEND_URL: ${BRIDGE_DOMAIN} API_URL: "http://bridge-api:3001" NEXTAUTH_URL: ${BRIDGE_DOMAIN} NEXTAUTH_SECRET: ${NEXTAUTH_SECRET} - NEXTAUTH_AUDIENCE: ${NEXTAUTH_AUDIENCE} - NEXTAUTH_SIGNING_KEY_B64: ${NEXTAUTH_SIGNING_KEY_B64} - NEXTAUTH_ENCRYPTION_KEY_B64: ${NEXTAUTH_ENCRYPTION_KEY_B64} - GITLAB_EMAIL_ADDRESS: ${GITLAB_EMAIL_ADDRESS} - GITLAB_ID: ${GITLAB_ID} - GITLAB_SECRET: ${GITLAB_SECRET} - SIGNALD_ENABLED: "true" - SIGNALD_SOCKET: /signald/signald.sock services: postgresql: diff --git a/docker/compose/zammad.yml b/docker/compose/zammad.yml index 9c79e30..066458a 100644 --- a/docker/compose/zammad.yml +++ b/docker/compose/zammad.yml @@ -1,5 +1,3 @@ -version: "3.4" - x-global-vars: &common-global-variables TZ: Etc/UTC