diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index 715373110..e5f045b90 100644 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -88,7 +88,7 @@ if [ ! -f "${arg_infraversionpath}/infra_version.js" ]; then exit 1 fi -images=$(node -e "var i = require('${arg_infraversionpath}/infra_version.js'); console.log(i.baseImages.join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));") +images=$(node -e "var i = require('${arg_infraversionpath}/infra_version.js'); console.log(i.baseImages.map(function (x) { return x.tag; }).join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));") echo -e "\tPulling docker images: ${images}" for image in ${images}; do diff --git a/scripts/installer.sh b/scripts/installer.sh index 498c75099..76fd40268 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -82,7 +82,7 @@ if [[ ${try} -eq 10 ]]; then fi echo "==> installer: downloading new addon images" -images=$(node -e "var i = require('${box_src_tmp_dir}/src/infra_version.js'); console.log(i.baseImages.join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));") +images=$(node -e "var i = require('${arg_infraversionpath}/infra_version.js'); console.log(i.baseImages.map(function (x) { return x.tag; }).join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));") echo -e "\tPulling docker images: ${images}" for image in ${images}; do diff --git a/src/infra_version.js b/src/infra_version.js index 6af16d9e6..1b2bc7127 100644 --- a/src/infra_version.js +++ b/src/infra_version.js @@ -8,7 +8,9 @@ exports = module.exports = { // a version change recreates all containers with latest docker config 'version': '48.12.0', - 'baseImages': [ 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' ], + 'baseImages': [ + { repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' } + ], // a major version bump in the db containers will trigger the restore logic that uses the db dumps // docker inspect --format='{{index .RepoDigests 0}}' $IMAGE to get the sha256