diff --git a/Changelog.md b/Changelog.md index dab974618a4ab915d74072873f8d7f9e3db15818..463ac46b7de33970b562df111e9f331288e5c8e6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## [1.2.4] - 2018-12-17 +### Added +* reintroduced image-import prior to build + ## [1.2.3] - 2018-11-05 ### Changed * option `--certificate-authority` is now optional, so you do not need to provide it in case your apiserver is using a valid public certificate @@ -38,3 +42,4 @@ [1.2.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.2.0...release%2F1.2.1 [1.2.2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.2.1...release%2F1.2.2 [1.2.3]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.2.2...release%2F1.2.3 +[1.2.4]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.2.3...release%2F1.2.4 diff --git a/assets/deployer b/assets/deployer index 1a24f8a4fd5b2d5dd843fad88b170ac22fc002cc..3b80c6e6a529e9fb1d9a70379f97b0c665fb1e16 100755 --- a/assets/deployer +++ b/assets/deployer @@ -349,7 +349,7 @@ build_image() { echo -ne "building image..." local out - local cmd="docker build --pull" + local cmd="docker build --pull --cache-from=${image_name}" for arg in $buildargs;do echo "adding $arg to build command" @@ -438,6 +438,7 @@ fi case $1 in build) + import_image build_image && save_image ;; publish)