From 70000ac6c16240456fcf16b8ab27bf00d35fb475 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 1 Jul 2021 16:56:18 +0200 Subject: [PATCH] remove eos related stuff (leave documentation) --- .codacy.yml | 2 - .drone.star | 73 ------------ ocis/docker-compose-eos-test.yml | 179 ---------------------------- ocis/docker-compose.yml | 177 --------------------------- ocis/docker/eos-ocis-dev/Dockerfile | 24 ---- ocis/docker/eos-ocis-dev/README.md | 88 -------------- ocis/docker/eos-ocis-dev/entrypoint | 6 - ocis/docker/eos-ocis-dev/start-ldap | 17 --- ocis/docker/eos-ocis/Dockerfile | 7 -- ocis/docker/eos-ocis/README.md | 30 ----- ocis/docker/eos-ocis/entrypoint | 17 --- ocis/docker/eos-ocis/setup | 23 ---- 12 files changed, 643 deletions(-) delete mode 100644 ocis/docker-compose-eos-test.yml delete mode 100644 ocis/docker-compose.yml delete mode 100644 ocis/docker/eos-ocis-dev/Dockerfile delete mode 100644 ocis/docker/eos-ocis-dev/README.md delete mode 100755 ocis/docker/eos-ocis-dev/entrypoint delete mode 100755 ocis/docker/eos-ocis-dev/start-ldap delete mode 100644 ocis/docker/eos-ocis/Dockerfile delete mode 100644 ocis/docker/eos-ocis/README.md delete mode 100755 ocis/docker/eos-ocis/entrypoint delete mode 100755 ocis/docker/eos-ocis/setup diff --git a/.codacy.yml b/.codacy.yml index ec649ef51b..eabfd62a7a 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -12,8 +12,6 @@ exclude_paths: - 'idp/scripts/**' - 'settings/rollup.config.js' - 'accounts/rollup.config.js' - - 'ocis/docker/eos-ocis/Dockerfile' - - 'ocis/docker/eos-ocis-dev/Dockerfile' - 'deployments/**' - 'tests/acceptance/expected-failures-*.md' - 'tests/acceptance/features/bootstrap/**' diff --git a/.drone.star b/.drone.star index b912505fcc..f718437f4d 100644 --- a/.drone.star +++ b/.drone.star @@ -140,7 +140,6 @@ def main(ctx): build_release_pipelines = \ dockerReleases(ctx) + \ - [dockerEos(ctx)] + \ binaryReleases(ctx) + \ [releaseSubmodule(ctx)] @@ -921,78 +920,6 @@ def dockerRelease(ctx, arch): "volumes": [pipelineVolumeGo], } -def dockerEos(ctx): - return { - "kind": "pipeline", - "type": "docker", - "name": "docker-eos-ocis", - "platform": { - "os": "linux", - "arch": "amd64", - }, - "steps": skipIfUnchanged(ctx, "build-docker") + - makeNodeGenerate("") + - makeGoGenerate("") + [ - { - "name": "build", - "image": OC_CI_GOLANG, - "commands": [ - "make -C ocis release-linux-docker-amd64", - ], - }, - { - "name": "dryrun-eos-ocis", - "image": "plugins/docker:latest", - "settings": { - "dry_run": True, - "context": "ocis", - "tags": "linux-eos-ocis", - "dockerfile": "ocis/docker/eos-ocis/Dockerfile", - "repo": "owncloud/eos-ocis", - }, - "when": { - "ref": { - "include": [ - "refs/pull/**", - ], - }, - }, - }, - { - "name": "docker-eos-ocis", - "image": "plugins/docker:latest", - "settings": { - "username": { - "from_secret": "docker_username", - }, - "password": { - "from_secret": "docker_password", - }, - "auto_tag": True, - "context": "ocis", - "dockerfile": "ocis/docker/eos-ocis/Dockerfile", - "repo": "owncloud/eos-ocis", - }, - "when": { - "ref": { - "exclude": [ - "refs/pull/**", - ], - }, - }, - }, - ], - "depends_on": getPipelineNames(testOcisModules(ctx) + testPipelines(ctx)), - "trigger": { - "ref": [ - "refs/heads/master", - "refs/tags/v*", - "refs/pull/**", - ], - }, - "volumes": [pipelineVolumeGo], - } - def binaryReleases(ctx): pipelines = [] for os in config["binaryReleases"]["os"]: diff --git a/ocis/docker-compose-eos-test.yml b/ocis/docker-compose-eos-test.yml deleted file mode 100644 index b6172b1c48..0000000000 --- a/ocis/docker-compose-eos-test.yml +++ /dev/null @@ -1,179 +0,0 @@ ---- -version: '3.5' - -networks: - testnet: - name: testnet - -services: - ocis: - container_name: ocis - ## Comment out either the 'build:' section or the 'image:' line. They are mutually exclusive. - ## Using an image is prefered, as this is the published way of building and faster. - image: owncloud/eos-ocis:${EOS_OCIS_TAG:-1.0.0-rc5} - #build: - # context: ./docker/eos-ocis - # args: - # BRANCH: ${BRANCH:-v1.0.0-rc5} - tty: true - privileged: true - stdin_open: true - ports: - - 9200:9200 - env_file: - - ./config/eos-docker.env - hostname: ocis - networks: - - testnet - environment: - # ocis log level will be used for all services - OCIS_LOG_LEVEL: debug - # domain setup - # TODO currently the below lines hardcode the port to 9200, use an OCIS_URL that includes protocol and port - OCIS_URL: https://${OCIS_DOMAIN:-localhost:9200} - # make home and users storages use eos - STORAGE_HOME_DRIVER: eoshome - STORAGE_USERS_DRIVER: eos - # make accounts use ocis storage driver - # TODO provision metadata storage in eos and switch to cs3 backend for accounts - ACCOUNTS_LOG_LEVEL: debug - ACCOUNTS_STORAGE_DISK_PATH: /var/tmp/ocis/accounts - # TODO make id the default in ocis-storage - STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" - # common eos settings used for both drivers: eos and eoshome - STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - STORAGE_DRIVER_EOS_NAMESPACE: "/eos/dockertest/reva/users" - # the eos end xrdcopy binaries use this env var to find the eos mgm - EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - # TODO without this the /etc/nclcd.conf file is empty - LDAP_BINDDN: "cn=reva,ou=sysusers,dc=ocis,dc=test" - LDAP_BINDPW: "reva" - - mgm-master: - container_name: mgm-master - image: owncloud/eos-mgm:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: mgm-master.testnet - networks: - - testnet - volumes: - - eos-mgm-master-log:/var/log/eos - - eos-mgm-master-config:/var/eos/config - - eos-mgm-master-ns-queue:/var/eos/ns-queue - # this volume kills mgm-master during startup - # - ./e/master/var/eos/md:/var/eos/md - environment: - EOS_SET_MASTER: 1 - - mq-master: - container_name: mq-master - image: owncloud/eos-mq:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: mq-master.testnet - networks: - - testnet - volumes: - - eos-mq-master-log:/var/log/eos - - eos-mq-master-config:/var/eos/config - - eos-mq-master-ns-queue:/var/eos/ns-queue - environment: - EOS_SET_MASTER: 1 - - fst: - container_name: fst - image: owncloud/eos-fst:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: fst.testnet - networks: - - testnet - volumes: - - eos-fst-log:/var/log/eos - - eos-fst-disks:/disks - environment: - EOS_MGM_URL: "root://mgm-master.testnet" - - quark-1: - container_name: quark-1 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-1.testnet - networks: - - testnet - volumes: - - eos-quarkdb1:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - - quark-2: - container_name: quark-2 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-2.testnet - networks: - - testnet - volumes: - - eos-quarkdb2:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - - quark-3: - container_name: quark-3 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-3.testnet - networks: - - testnet - volumes: - - eos-quarkdb3:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - -volumes: - eos-mgm-master-log: - eos-mgm-master-config: - eos-mgm-master-ns-queue: - eos-mq-master-log: - eos-mq-master-config: - eos-mq-master-ns-queue: - eos-fst-log: - eos-fst-disks: - eos-quarkdb1: - eos-quarkdb2: - eos-quarkdb3: diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml deleted file mode 100644 index 6d9972befa..0000000000 --- a/ocis/docker-compose.yml +++ /dev/null @@ -1,177 +0,0 @@ ---- -version: '3.5' - -networks: - testnet: - name: testnet - -services: - ocis: - container_name: ocis - image: owncloud/eos-ocis-dev:latest - tty: true - privileged: true - stdin_open: true - ports: - - 9200:9200 - env_file: - - ./config/eos-docker.env - hostname: ocis - networks: - - testnet - volumes: - - .:/ocis - - ../accounts:/accounts - - ../glauth:/glauth - - ../idp:/idp - - ../web:/web - - ../ocis-pkg:/ocis-pkg - - ../ocs:/ocs - - ../proxy:/proxy - - ../settings:/settings - - ../store:/store - - ../thumbnails:/thumbnails - - ../webdav:/webdav - - ../storage:/storage - environment: - # ocis log level will be used for all services - OCIS_LOG_LEVEL: debug - # domain setup - # TODO currently the below lines hardcode the port to 9200, use an OCIS_URL that includes protocol and port - OCIS_URL: https://${OCIS_DOMAIN:-localhost:9200} - # TODO make id the default in ocis-storage - STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" - # common eos settings used for both drivers: eos and eoshome - STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - STORAGE_DRIVER_EOS_NAMESPACE: "/eos/dockertest/reva/users" - # the eos end xrdcopy binaries use this env var to find the eos mgm - EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - - mgm-master: - container_name: mgm-master - image: owncloud/eos-mgm:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: mgm-master.testnet - networks: - - testnet - volumes: - - eos-mgm-master-log:/var/log/eos - - eos-mgm-master-config:/var/eos/config - - eos-mgm-master-ns-queue:/var/eos/ns-queue - # this volume kills mgm-master during startup - # - ./e/master/var/eos/md:/var/eos/md - environment: - EOS_SET_MASTER: 1 - - mq-master: - container_name: mq-master - image: owncloud/eos-mq:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: mq-master.testnet - networks: - - testnet - volumes: - - eos-mq-master-log:/var/log/eos - - eos-mq-master-config:/var/eos/config - - eos-mq-master-ns-queue:/var/eos/ns-queue - environment: - EOS_SET_MASTER: 1 - - fst: - container_name: fst - image: owncloud/eos-fst:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: fst.testnet - networks: - - testnet - volumes: - - eos-fst-log:/var/log/eos - - eos-fst-disks:/disks - environment: - EOS_MGM_URL: "root://mgm-master.testnet" - - quark-1: - container_name: quark-1 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-1.testnet - networks: - - testnet - volumes: - - eos-quarkdb1:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - - quark-2: - container_name: quark-2 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-2.testnet - networks: - - testnet - volumes: - - eos-quarkdb2:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - - quark-3: - container_name: quark-3 - image: owncloud/eos-qdb:4.8.26 - tty: true - privileged: true - stdin_open: true - env_file: - - ./config/eos-docker.env - hostname: quark-3.testnet - networks: - - testnet - volumes: - - eos-quarkdb3:/var/lib/quarkdb - environment: - EOS_QDB_DIR: "/var/lib/quarkdb/eosns" - EOS_QDB_PORT: "7777" - EOS_QDB_MODE: "raft" - EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b" - EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777" - -volumes: - eos-mgm-master-log: - eos-mgm-master-config: - eos-mgm-master-ns-queue: - eos-mq-master-log: - eos-mq-master-config: - eos-mq-master-ns-queue: - eos-fst-log: - eos-fst-disks: - eos-quarkdb1: - eos-quarkdb2: - eos-quarkdb3: diff --git a/ocis/docker/eos-ocis-dev/Dockerfile b/ocis/docker/eos-ocis-dev/Dockerfile deleted file mode 100644 index ca442ffc7c..0000000000 --- a/ocis/docker/eos-ocis-dev/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM owncloud/eos-base:4.8.26 - -ENV CGO_ENABLED=1 -ENV GOOS=linux - -RUN rpm --rebuilddb && yum -y install \ - wget \ - time \ - make \ - gcc \ - git - -RUN wget -q https://dl.google.com/go/go1.15.7.linux-amd64.tar.gz -RUN mkdir -p /usr/local/bin -RUN tar xf go1.15.7.linux-amd64.tar.gz -C /usr/local -RUN ln -s /usr/local/go/bin/* /usr/local/bin - -COPY entrypoint /entrypoint -COPY start-ldap /start-ldap - -VOLUME [ "/ocis" ] -WORKDIR /ocis - - diff --git a/ocis/docker/eos-ocis-dev/README.md b/ocis/docker/eos-ocis-dev/README.md deleted file mode 100644 index 2a588bfb53..0000000000 --- a/ocis/docker/eos-ocis-dev/README.md +++ /dev/null @@ -1,88 +0,0 @@ -# Docker image for oCIS development with eos - -Image is based on [owncloud/eos-base](https://hub.docker.com/r/owncloud/eos-base) from [eos-stack](https://github.com/owncloud-docker/eos-stack) - -{{< hint info >}} -On MacOS do not mount a local folder to the `/var/tmp/reva/` path. The fuse driver used by docker [does not support extended attributes](https://docs.docker.com/v18.09/docker-for-mac/osxfs/). See [#182](https://github.com/owncloud/ocis/issues/182) for more details. -{{< /hint >}} - -## Build -```shell -docker build -t owncloud/eos-ocis-dev:latest . -``` - -## Publish -```shell -docker push owncloud/eos-ocis-dev:latest -``` - -## Maintainer - -* [Felix Böhm](https://github.com/felixboehm) - -## Disclaimer -Use only for development or testing. Setup is not secured nor tested. - -## oCIS development on eos - -### Setup oCIS - -To build and run your local ocis code with default storage driver - -```shell -docker run --rm -ti --name ocis -v $PWD:/ocis -p 9200:9200 owncloud/eos-ocis-dev -``` - -ocis will use the owncloud storage driver and store files in the container at /var/tmp/reva/data//files - -Data is here: `docker exec -it ocis ll /var/tmp/reva/` - -Alternative: With the [docker-compose.yml file in ocis repo](https://github.com/owncloud/ocis/blob/master/docker-compose.yml) you can also start ocis via compose: - -```shell -docker-compose up -d ocis -``` - -Now try to list the running services - -```shell -docker-compose exec ocis ./bin/ocis list -``` - -## Setup eos storage - -1. Start the eos cluster and ocis via the compose stack - -```shell -docker-compose up -d -``` - -2. Configure to use eos storage driver instead of default storage driver - -* kill the home storage and data providers. we need to switch them to the eoshome driver: - -```shell -docker-compose exec ocis ./bin/ocis kill reva-storage-home -docker-compose exec ocis ./bin/ocis kill reva-storage-home-data -``` - -* restart them with the eoshome driver and a new layout: - -```shell -docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DRIVER=eoshome -d ocis ./bin/ocis run reva-storage-home -docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome -d ocis ./bin/ocis run reva-storage-home-data -``` - -* restart the reva frontend with a new namespace (pointing to the eos storage provider) for the dav files endpoint - -```shell -docker-compose exec ocis ./bin/ocis kill reva-frontend -docker-compose exec -e DAV_FILES_NAMESPACE="/eos/" -d ocis ./bin/ocis run reva-frontend -``` - -* login with `einstein / relativity`, upload a file to einsteins home and verify the file is there using - -```shell -docker-compose exec ocis eos ls -l /eos/dockertest/reva/users/e/einstein/ --rw-r--r-- 1 einstein users 10 Jul 1 15:24 newfile.txt -``` diff --git a/ocis/docker/eos-ocis-dev/entrypoint b/ocis/docker/eos-ocis-dev/entrypoint deleted file mode 100755 index 35d46f347b..0000000000 --- a/ocis/docker/eos-ocis-dev/entrypoint +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -make build -/start-ldap & - -exec bin/ocis server \ No newline at end of file diff --git a/ocis/docker/eos-ocis-dev/start-ldap b/ocis/docker/eos-ocis-dev/start-ldap deleted file mode 100755 index 38c85d7481..0000000000 --- a/ocis/docker/eos-ocis-dev/start-ldap +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -LDAP_BINDDN=${LDAP_BINDDN:-cn=reva,ou=sysusers,dc=ocis,dc=test} -LDAP_BINDPW=${LDAP_BINDPW:-reva} - -echo "Waiting for EOS MGM" -echo "until nc -z -w 3 $EOS_MGM_ALIAS 1094; do sleep 2; done;" > /wait-for-mgm -chmod +x /wait-for-mgm - -/wait-for-mgm; -echo "----- [ocis] LDAP setup -----"; -authconfig --enableldap --enableldapauth --ldapserver=${EOS_LDAP_HOST} --ldapbasedn="dc=ocis,dc=test" --update; -sed -i "s/#binddn cn=.*/binddn ${LDAP_BINDDN}/" /etc/nslcd.conf -sed -i "s/#bindpw .*/bindpw ${LDAP_BINDPW}/" /etc/nslcd.conf -# start in debug mode; - -nslcd -d diff --git a/ocis/docker/eos-ocis/Dockerfile b/ocis/docker/eos-ocis/Dockerfile deleted file mode 100644 index 29b559320d..0000000000 --- a/ocis/docker/eos-ocis/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM owncloud/eos-base:4.8.26 -RUN mkdir -p /usr/local/bin -COPY dist/binaries/ocis-linux-amd64 /usr/local/bin/ocis -RUN chmod +x /usr/local/bin/ocis - -COPY docker/eos-ocis/setup /setup -COPY docker/eos-ocis/entrypoint /entrypoint diff --git a/ocis/docker/eos-ocis/README.md b/ocis/docker/eos-ocis/README.md deleted file mode 100644 index b987ec27b6..0000000000 --- a/ocis/docker/eos-ocis/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Docker image for oCIS running on eos - -Image is based on [owncloud/eos-base](https://hub.docker.com/r/owncloud/eos-base) from [eos-stack](https://github.com/owncloud-docker/eos-stack) - -## Build -Build owncloud/ocis master branch -```shell -docker build -t owncloud/eos-ocis:latest . -``` - -Or build a certain branch / tag -```shell -docker build -t owncloud/eos-ocis:1.0.0 --build-arg BRANCH=v1.0.0./eos-ocis -``` - -## Publish -```shell -docker push owncloud/eos-ocis:latest -``` - -## Maintainer - - * [Felix Böhm](https://github.com/felixboehm) - -## Disclaimer -Use only for development or testing. Setup is not secured nor tested. - -## Example Usage - -See diff --git a/ocis/docker/eos-ocis/entrypoint b/ocis/docker/eos-ocis/entrypoint deleted file mode 100755 index fe6a128c3c..0000000000 --- a/ocis/docker/eos-ocis/entrypoint +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# todo: log all ocis services to stdout - -echo "Waiting for EOS MGM" -echo "until nc -z -w 3 $EOS_MGM_ALIAS 1094; do sleep 2; done;" > /wait-for-mgm -chmod +x /wait-for-mgm -mkdir -p /var/log/ocis - -(/wait-for-mgm; /setup > /var/log/ocis/setup.log; cat /var/log/ocis/setup.log ) & - -# TODO do we still need to precreate this folder? -mkdir -p /var/tmp/reva - -echo "----- [ocis] Starting oCIS -----" -# todo start ocis as daemon not as root -exec ocis server diff --git a/ocis/docker/eos-ocis/setup b/ocis/docker/eos-ocis/setup deleted file mode 100755 index d629eeb009..0000000000 --- a/ocis/docker/eos-ocis/setup +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -x - -echo "----- [ocis] LDAP setup -----" -authconfig --enableldap --enableldapauth --ldapserver=${EOS_LDAP_HOST} --ldapbasedn="dc=ocis,dc=test" --update -sed -i "s/#binddn cn=.*/binddn ${LDAP_BINDDN}/" /etc/nslcd.conf -sed -i "s/#bindpw .*/bindpw ${LDAP_BINDPW}/" /etc/nslcd.conf -# start in debug mode -nslcd -d & - -# echo "----- [ocis] eos setup -----" -# eos -r 0 0 -b vid set membership daemon -uids adm -# eos -r 0 0 -b vid set membership daemon -gids adm -# eos -r 0 0 -b vid set membership daemon +sudo -# eos -r 0 0 -b vid set map -unix "" vuid:0 vgid:0 -# # eos -r 0 0 -b vid add gateway ocis.testnet -# eos -r 0 0 -b vid add gateway ocis - -# todo start ocis as daemon not as root -# eos -r 0 0 -b vid set membership root -uids adm -# eos -r 0 0 -b vid set membership root -gids adm -# eos -r 0 0 -b vid set membership root +sudo