Added new console binary, added port to config, added default env for redirect

This commit is contained in:
Elias Hackradt 2021-07-11 22:15:23 +02:00
parent c65ab2057f
commit 612d47f4ac
No known key found for this signature in database
GPG Key ID: 32B038A64E6697B1
3 changed files with 20 additions and 6 deletions

View File

@ -5,9 +5,16 @@
"description": "file://DESCRIPTION.md", "description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG", "changelog": "file://CHANGELOG",
"tagline": "Distributed object storage", "tagline": "Distributed object storage",
"version": "1.165.1", "version": "1.2.0",
"healthCheckPath": "/minio/login", "healthCheckPath": "/minio/login",
"httpPort": 8000, "httpPort": 8000,
"tcpPorts": {
"API_PORT": {
"title": "API PORT",
"description": "API PORT",
"defaultValue": 9000
}
},
"addons": { "addons": {
"localstorage": {} "localstorage": {}
}, },

View File

@ -3,9 +3,11 @@ FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3f
RUN mkdir -p /app/code RUN mkdir -p /app/code
WORKDIR /app/code WORKDIR /app/code
ARG VERSION=RELEASE.2021-07-08T01-15-01Z ARG VERSION=RELEASE.2021-07-08T19-43-25Z
ARG MC_VERSION=RELEASE.2021-06-13T17-48-22Z
RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio && \
wget https://dl.min.io/client/mc/release/linux-amd64/mc.${MC_VERSION} -O /app/code/mc && chmod +x /app/code/mc
ADD start.sh /app/code/start.sh ADD start.sh /app/code/start.sh
ADD minio-credentials /app/code/minio-credentials ADD minio-credentials /app/code/minio-credentials

View File

@ -9,11 +9,16 @@ mkdir -p /app/data/data /run/minio/config /run/minio/certs
echo "==> Changing ownership" echo "==> Changing ownership"
[[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data [[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data
[[ ! -f /app/data/env.sh ]] && echo -e "# Add custom minio configuration to this file. Restart the app for changes to take effect.\n\nexport CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'" > /app/data/env.sh if [[ ! -f /app/data/env.sh ]]; then
echo -e "# Add custom minio configuration to this file. Restart the app for changes to take effect.\n\nexport CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'" > /app/data/env.sh
echo -e "MINIO_BROWSER_REDIRECT_URI=$(echo $CLOUDRON_APP_ORIGIN)" >> /app/data/env.sh
# echo -e "CONSOLE_PBKDF_PASSPHRASE=$(openssl rand -hex 64)" >> /app/data/env.sh
# echo -e "CONSOLE_PBKDF_SALT=$(openssl rand -hex 64)" >> /app/data/env.sh
# echo -e "CONSOLE_MINIO_SERVER=http://localhost:9000" >> /app/data/env.sh
fi
source /app/data/env.sh source /app/data/env.sh
# the --config-dir is deprecated and not used. but without it, minio will try to create $HOME/.minio :/ same for --certs-dir # the --config-dir is deprecated and not used. but without it, minio will try to create $HOME/.minio :/ same for --certs-dir
echo "==> Starting minio" echo "==> Starting minio"
exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --certs-dir /run/minio/certs --config-dir /run/minio/config --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :8000 exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --certs-dir /run/minio/certs --config-dir /run/minio/config --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :$API_PORT --console-address :8000