diff --git a/docker/forgejo-runner/docker-compose.yml b/docker/forgejo-runner/docker-compose.yml deleted file mode 100644 index 3cc2359..0000000 --- a/docker/forgejo-runner/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -x-runner-common: &runner-common - image: code.forgejo.org/forgejo/runner:12.7.3 - links: - - docker-in-docker - depends_on: - docker-in-docker: - condition: service_started - user: 1001:1001 - restart: unless-stopped - command: '/bin/sh -c "sleep 5; forgejo-runner daemon"' - environment: - DOCKER_HOST: tcp://docker-in-docker:2375 - -networks: - forgejo: - external: false - -services: - docker-in-docker: - image: docker:dind - container_name: 'docker_dind' - privileged: true - command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false'] - restart: 'unless-stopped' - - runner: - <<: *runner-common - container_name: 'runner' - volumes: - - ${FORGEJO_RUNNER_DATA:-/mnt/nas1/shared/forgejo-runner/data}:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - - runner-2: - <<: *runner-common - container_name: 'runner2' - volumes: - - ${FORGEJO_RUNNER_DATA:-/mnt/nas1/shared/forgejo-runner/data2}:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro diff --git a/k8s/charts/oxicloud/values.yaml b/k8s/charts/oxicloud/values.yaml index 96ab6a9..3bbd384 100644 --- a/k8s/charts/oxicloud/values.yaml +++ b/k8s/charts/oxicloud/values.yaml @@ -17,7 +17,7 @@ config: server: port: 8086 host: "0.0.0.0" - baseUrl: "http://cloud.example.com" + baseUrl: "https://cloud.example.com" features: enableAuth: "true" enableSharing: "true" @@ -44,11 +44,9 @@ wopi: admin: username: admin password: "wopi_admin_password" - # In production behind an ingress, you'd likely enable SSL termination. extraParams: "--o:ssl.enable=false --o:ssl.termination=false --o:net.frame_ancestors=http://* https://*" secrets: - # If existingSecret is set, the chart will NOT create a Secret and will use this one instead. existingSecret: "" jwtSecret: "" oidcClientSecret: "" @@ -59,7 +57,7 @@ service: ingress: enabled: true - className: "nginx" # Adjust to your ingress controller (e.g., traefik) + className: "traefik" annotations: {} hosts: - host: cloud.example.com @@ -67,6 +65,3 @@ ingress: - path: / pathType: ImplementationSpecific tls: [] - # - secretName: oxicloud-tls - # hosts: - # - cloud.example.com