Merge pull request #9493 from owncloud/continuous-deploymemts

ci: bring up the new continous deployments

deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml

@@ -13,6 +13,15 @@ services:
       # will expose the same metrics, so it's sufficient to query one endpoint
       PROXY_DEBUG_ADDR: 0.0.0.0:9205
 
+  collaboration-oo:
+    environment:
+      # tracing
+      OCIS_TRACING_ENABLED: "true"
+      OCIS_TRACING_TYPE: "jaeger"
+      OCIS_TRACING_ENDPOINT: jaeger-agent:6831
+      # metrics
+      COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304
+
 networks:
   ocis-net:
     external: true

deployments/examples/ocis_keycloak/docker-compose.yml

@@ -48,7 +48,7 @@ services:
     restart: always
 
   ocis:
-    image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     entrypoint:

deployments/examples/ocis_ldap/docker-compose.yml

@@ -47,7 +47,7 @@ services:
     restart: always
 
   ocis:
-    image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     depends_on:

deployments/examples/ocis_s3/.env

@@ -1,39 +0,0 @@
-# If you're on a internet facing server please comment out following line.
-# It skips certificate validation for various parts of oCIS and is needed if you use self signed certificates.
-INSECURE=true
-
-### Traefik settings ###
-# Serve Traefik dashboard. Defaults to "false".
-TRAEFIK_DASHBOARD=
-# Domain of Traefik, where you can find the dashboard. Defaults to "traefik.owncloud.test"
-TRAEFIK_DOMAIN=
-# Basic authentication for the dashboard. Defaults to user "admin" and password "admin"
-TRAEFIK_BASIC_AUTH_USERS=
-# Email address for obtaining LetsEncrypt certificates, needs only be changed if this is a public facing server
-TRAEFIK_ACME_MAIL=
-
-### oCIS settings ###
-# oCIS version. Defaults to "latest"
-OCIS_DOCKER_TAG=
-# Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test"
-OCIS_DOMAIN=
-# oCIS admin user password. Defaults to "admin".
-ADMIN_PASSWORD=
-# The demo users should not be created on a production instance
-# because their passwords are public. Defaults to "false".
-DEMO_USERS=
-
-### MINIO / S3 settings ###
-# Domain of MinIO where the Web UI is accessible. Defaults to "minio.owncloud.test".
-MINIO_DOMAIN=
-# S3 bucket name, where oCIS stores its data in. Defaults to "ocis-bucket".
-MINIO_BUCKET=
-# S3 bucket access key, which oCIS uses to authenticate. Defaults to "ocis".
-MINIO_ACCESS_KEY=
-# S3 bucket access key secret, which oCIS uses to authenticate. Defaults to "ocis-secret-key".
-MINIO_SECRET_KEY=
-
-# If you want to use debugging and tracing with this stack,
-# you need uncomment following line. Please see documentation at
-# https://owncloud.dev/ocis/deployment/monitoring-tracing/
-#COMPOSE_FILE=docker-compose.yml:monitoring_tracing/docker-compose-additions.yml

deployments/examples/ocis_s3/README.md

@@ -1,6 +0,0 @@
----
-document this deployment example in: docs/ocis/deployment/ocis_s3.md
----
-
-Please refer to [our documentation](https://owncloud.dev/ocis/deployment/ocis_s3/)
-for instructions on how to deploy this scenario.

deployments/examples/ocis_s3/docker-compose.yml

@@ -1,132 +0,0 @@
----
-version: "3.7"
-
-services:
-  traefik:
-    image: traefik:v2.9.1
-    networks:
-      ocis-net:
-        aliases:
-          - ${OCIS_DOMAIN:-ocis.owncloud.test}
-    command:
-      - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}"
-      # letsencrypt configuration
-      - "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@example.org}"
-      - "--certificatesResolvers.http.acme.storage=/certs/acme.json"
-      - "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http"
-      # enable dashboard
-      - "--api.dashboard=true"
-      # define entrypoints
-      - "--entryPoints.http.address=:80"
-      - "--entryPoints.http.http.redirections.entryPoint.to=https"
-      - "--entryPoints.http.http.redirections.entryPoint.scheme=https"
-      - "--entryPoints.https.address=:443"
-      # docker provider (get configuration from container labels)
-      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
-      - "--providers.docker.exposedByDefault=false"
-      # access log
-      - "--accessLog=true"
-      - "--accessLog.format=json"
-      - "--accessLog.fields.headers.names.X-Request-Id=keep"
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "certs:/certs"
-    labels:
-      - "traefik.enable=${TRAEFIK_DASHBOARD:-false}"
-      - "traefik.http.middlewares.traefik-auth.basicauth.users=${TRAEFIK_BASIC_AUTH_USERS:-admin:$$apr1$$4vqie50r$$YQAmQdtmz5n9rEALhxJ4l.}" # defaults to admin:admin
-      - "traefik.http.routers.traefik.entrypoints=https"
-      - "traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:-traefik.owncloud.test}`)"
-      - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      - "traefik.http.routers.traefik.tls.certresolver=http"
-      - "traefik.http.routers.traefik.service=api@internal"
-    logging:
-      driver: "local"
-    restart: always
-
-  ocis:
-    image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
-    networks:
-      ocis-net:
-    entrypoint:
-      - /bin/sh
-    # run ocis init to initialize a configuration file with random secrets
-    # it will fail on subsequent runs, because the config file already exists
-    # therefore we ignore the error and then start the ocis server
-    command: ["-c", "ocis init || true; ocis server"]
-    environment:
-      OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
-      OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-info}
-      OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
-      PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
-      # activate s3ng storage driver
-      STORAGE_USERS_DRIVER: s3ng
-      STORAGE_SYSTEM_DRIVER: ocis # keep system data on ocis storage since this are only small files atm
-      # s3ng specific settings
-      STORAGE_USERS_S3NG_ENDPOINT: http://minio:9000
-      STORAGE_USERS_S3NG_REGION: default
-      STORAGE_USERS_S3NG_ACCESS_KEY: ${MINIO_ACCESS_KEY:-ocis}
-      STORAGE_USERS_S3NG_SECRET_KEY: ${MINIO_SECRET_KEY:-ocis-secret-key}
-      STORAGE_USERS_S3NG_BUCKET: ${MINIO_BUCKET:-ocis-bucket}
-      # INSECURE: needed if oCIS / Traefik is using self generated certificates
-      OCIS_INSECURE: "${INSECURE:-false}"
-      # basic auth (not recommended, but needed for e.g., WebDav clients that do not support OpenID Connect)
-      PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}"
-      # admin user password
-      IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # this overrides the admin password from the configuration file
-      # demo users
-      IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}"
-      # password policies
-      OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt"
-    volumes:
-      - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt
-      - ocis-config:/etc/ocis
-      - ocis-data:/var/lib/ocis
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.ocis.entrypoints=https"
-      - "traefik.http.routers.ocis.rule=Host(`${OCIS_DOMAIN:-ocis.owncloud.test}`)"
-      - "traefik.http.routers.ocis.tls.certresolver=http"
-      - "traefik.http.routers.ocis.service=ocis"
-      - "traefik.http.services.ocis.loadbalancer.server.port=9200"
-    logging:
-      driver: "local"
-    restart: always
-
-  minio:
-    image: minio/minio:latest
-    networks:
-      ocis-net:
-    entrypoint:
-      - /bin/sh
-    command:
-      [
-        "-c",
-        "mkdir -p /data/${MINIO_BUCKET:-ocis-bucket} && minio server --console-address ':9001' /data",
-      ]
-    volumes:
-      - minio-data:/data
-    environment:
-      MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY:-ocis}
-      MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:-ocis-secret-key}
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.minio.entrypoints=https"
-      - "traefik.http.routers.minio.rule=Host(`${MINIO_DOMAIN:-minio.owncloud.test}`)"
-      - "traefik.http.routers.minio.tls.certresolver=http"
-      - "traefik.http.routers.minio.service=minio"
-      - "traefik.http.services.minio.loadbalancer.server.port=9001"
-    logging:
-      driver: "local"
-    restart: always
-
-volumes:
-  certs:
-  ocis-config:
-  ocis-data:
-  minio-data:
-
-networks:
-  ocis-net: