diff --git a/setup/INFRA_VERSION b/setup/INFRA_VERSION index 487d57402..461cc84a7 100644 --- a/setup/INFRA_VERSION +++ b/setup/INFRA_VERSION @@ -3,15 +3,14 @@ # If you change the infra version, be sure to put a warning # in the change log -INFRA_VERSION=16 +INFRA_VERSION=17 # WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING # These constants are used in the installer script as well -BASE_IMAGE=cloudron/base:0.6.0 -MYSQL_IMAGE=cloudron/mysql:0.6.0 -POSTGRESQL_IMAGE=cloudron/postgresql:0.6.0 -MONGODB_IMAGE=cloudron/mongodb:0.6.0 -REDIS_IMAGE=cloudron/redis:0.6.1 # if you change this, fix src/addons.js as well -MAIL_IMAGE=cloudron/mail:0.6.0 -GRAPHITE_IMAGE=cloudron/graphite:0.6.0 - +BASE_IMAGE=cloudron/base:0.7.0 +MYSQL_IMAGE=cloudron/mysql:0.7.0 +POSTGRESQL_IMAGE=cloudron/postgresql:0.7.0 +MONGODB_IMAGE=cloudron/mongodb:0.7.0 +REDIS_IMAGE=cloudron/redis:0.7.0 # if you change this, fix src/addons.js as well +MAIL_IMAGE=cloudron/mail:0.7.0 +GRAPHITE_IMAGE=cloudron/graphite:0.7.0 diff --git a/setup/start/setup_infra.sh b/setup/start/setup_infra.sh index dd60dd35a..6ab09a7b3 100755 --- a/setup/start/setup_infra.sh +++ b/setup/start/setup_infra.sh @@ -34,7 +34,7 @@ graphite_container_id=$(docker run --restart=always -d --name="graphite" \ -p 127.0.0.1:2004:2004 \ -p 127.0.0.1:8000:8000 \ -v "${DATA_DIR}/graphite:/app/data" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ "${GRAPHITE_IMAGE}") echo "Graphite container id: ${graphite_container_id}" @@ -45,7 +45,7 @@ mail_container_id=$(docker run --restart=always -d --name="mail" \ -h "${arg_fqdn}" \ -e "DOMAIN_NAME=${arg_fqdn}" \ -v "${DATA_DIR}/box/mail:/app/data" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ "${MAIL_IMAGE}") echo "Mail container id: ${mail_container_id}" @@ -62,7 +62,7 @@ mysql_container_id=$(docker run --restart=always -d --name="mysql" \ -h "${arg_fqdn}" \ -v "${DATA_DIR}/mysql:/var/lib/mysql" \ -v "${DATA_DIR}/addons/mysql_vars.sh:/etc/mysql/mysql_vars.sh:ro" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ "${MYSQL_IMAGE}") echo "MySQL container id: ${mysql_container_id}" @@ -77,7 +77,7 @@ postgresql_container_id=$(docker run --restart=always -d --name="postgresql" \ -h "${arg_fqdn}" \ -v "${DATA_DIR}/postgresql:/var/lib/postgresql" \ -v "${DATA_DIR}/addons/postgresql_vars.sh:/etc/postgresql/postgresql_vars.sh:ro" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ "${POSTGRESQL_IMAGE}") echo "PostgreSQL container id: ${postgresql_container_id}" @@ -92,7 +92,7 @@ mongodb_container_id=$(docker run --restart=always -d --name="mongodb" \ -h "${arg_fqdn}" \ -v "${DATA_DIR}/mongodb:/var/lib/mongodb" \ -v "${DATA_DIR}/addons/mongodb_vars.sh:/etc/mongodb_vars.sh:ro" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ "${MONGODB_IMAGE}") echo "Mongodb container id: ${mongodb_container_id}" @@ -107,4 +107,3 @@ else fi echo -n "${INFRA_VERSION}" > "${DATA_DIR}/INFRA_VERSION" - diff --git a/src/addons.js b/src/addons.js index 067f6b1d6..c0a3b1b5a 100644 --- a/src/addons.js +++ b/src/addons.js @@ -756,12 +756,11 @@ function setupRedis(app, options, callback) { name: 'redis-' + app.id, Hostname: config.appFqdn(app.location), Tty: true, - Image: 'cloudron/redis:0.6.1', // if you change this, fix setup/INFRA_VERSION as well + Image: 'cloudron/redis:0.7.0', // if you change this, fix setup/INFRA_VERSION as well Cmd: null, Volumes: { '/tmp': {}, - '/run': {}, - '/var/log': {} + '/run': {} }, VolumesFrom: [] }; diff --git a/src/routes/test/start_addons.sh b/src/routes/test/start_addons.sh index 59fad8867..cf6ac88b3 100755 --- a/src/routes/test/start_addons.sh +++ b/src/routes/test/start_addons.sh @@ -25,7 +25,7 @@ start_postgresql() { docker rm -f postgresql 2>/dev/null 1>&2 || true docker run -dtP --name=postgresql -v "${postgresqldatadir}:/var/lib/postgresql" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ -v /tmp/postgresql_vars.sh:/etc/postgresql/postgresql_vars.sh "${POSTGRESQL_IMAGE}" >/dev/null } @@ -43,7 +43,7 @@ start_mysql() { docker rm -f mysql 2>/dev/null 1>&2 || true docker run -dP --name=mysql -v "${mysqldatadir}:/var/lib/mysql" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ -v /tmp/mysql_vars.sh:/etc/mysql/mysql_vars.sh "${MYSQL_IMAGE}" >/dev/null } @@ -61,7 +61,7 @@ start_mongodb() { docker rm -f mongodb 2>/dev/null 1>&2 || true docker run -dP --name=mongodb -v "${mongodbdatadir}:/var/lib/mongodb" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ -v /tmp/mongodb_vars.sh:/etc/mongodb_vars.sh "${MONGODB_IMAGE}" >/dev/null } @@ -71,7 +71,7 @@ start_mail() { docker rm -f mail 2>/dev/null 1>&2 || true docker run -dP --name=mail -e DOMAIN_NAME="localhost" \ - --read-only -v /tmp -v /run -v /var/log \ + --read-only -v /tmp -v /run \ -v /tmp/maildata:/app/data "${MAIL_IMAGE}" >/dev/null }