diff --git a/Dockerfile b/Dockerfile index 54b9329..8d37f05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617 RUN mkdir -p /app/code \ - && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2019-01-10T00-21-20Z -O /app/code/minio \ - && chmod +x /app/code/minio + && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2019-01-16T21-44-08Z -O /app/code/minio \ + && chmod +x /app/code/minio \ + && wget https://dl.minio.io/client/mc/release/linux-amd64/mc.RELEASE.2019-01-10T00-38-22Z -O /app/code/mc \ + && chmod +x /app/code/mc WORKDIR /app/code diff --git a/config.json b/config.json index c548cdb..0f53336 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,5 @@ { - "version": "10", + "version": "33", "credential": { "accessKey": "admin", "secretKey": "secretkey" @@ -9,67 +9,6 @@ "console": { "enable": true, "level": "error" - }, - "file": { - "enable": false, - "fileName": "", - "level": "" - } - }, - "notify": { - "amqp": { - "1": { - "enable": false, - "url": "", - "exchange": "", - "routingKey": "", - "exchangeType": "", - "mandatory": false, - "immediate": false, - "durable": false, - "internal": false, - "noWait": false, - "autoDeleted": false - } - }, - "nats": { - "1": { - "enable": false, - "address": "", - "subject": "", - "username": "", - "password": "", - "token": "", - "secure": false, - "pingInterval": 0 - } - }, - "elasticsearch": { - "1": { - "enable": false, - "url": "", - "index": "" - } - }, - "redis": { - "1": { - "enable": false, - "address": "", - "password": "", - "key": "" - } - }, - "postgresql": { - "1": { - "enable": false, - "connectionString": "", - "table": "", - "host": "", - "port": "", - "user": "", - "password": "", - "database": "" - } } } } diff --git a/start.sh b/start.sh index ae6db58..2dd5863 100755 --- a/start.sh +++ b/start.sh @@ -2,12 +2,16 @@ set -eu -mkdir -p /app/data/data /app/data/config +mkdir -p /app/data/data /app/data/certs /app/data/config if ! [ -f /app/data/config/config.json ]; then cp /app/code/config.json /app/data/config/config.json fi -exec ./minio server -C /app/data/config --address :8000 /app/data/data +echo "Changing ownership" +chown -R cloudron:cloudron /app/data + +echo "Starting minio" +exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio server --config-dir /app/data/config --certs-dir /app/data/certs --address :8000 /app/data/data