diff --git a/Changelog.md b/Changelog.md index 1e1e5ebcb7991cdd6c6610f71b448aa42c978146..fc5649eba919f6b0fe029267edb2d6fd145c93d2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## [1.2.1] - 2018-09-05 +### Changed +* enable import image prior to build process with `--input` + ## [1.2.0] - 2018-09-05 ### Added * `add-repo` command to add remote repositories @@ -21,3 +25,4 @@ [1.1.0]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.0.0...release%2F1.1.0 [1.1.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.1.0...release%2F1.1.1 [1.2.0]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.1.1...release%2F1.2.0 +[1.2.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.2.0...release%2F1.2.1 diff --git a/Readme.md b/Readme.md index a0277d9474094ef6f2d8f466e7de114151be2807..46b25825f5653a5901e24e5cc0065a81acad812c 100644 --- a/Readme.md +++ b/Readme.md @@ -90,12 +90,13 @@ From now on charts located in this repository can be deployed by using the `--ch ## docker build +* `--input`: sets the filepath to the file from where the image is loaded prior to build * `--build-arg`: used to provide build-arguments do `docker build`-command. This is mainly used for `HTTP_PROXY`/`http_proxy`: When you specify `--build-arg HTTP_PROXY=...` the tool adds the build argument `--build-arg http_proxy=...` as well, so lower-case proxy-variables are provided automatically. Nevertheless can you use this option to provide your own build-arguments within the `Dockerfile` * `--output`: sets the filepath to the file where the built image is saved ## docker publish -* `--import`: sets the filepath to the file from where the image is loaded +* `--input`: sets the filepath to the file from where the image is loaded * `--docker-config`: sets the content of the file `~/.docker/config.json` which is used by docker to authenticate to the registry. This can contain multiple registry-servers and there credentials. Which registry is used depends on the image name. * `--name`: sets the name of the image. If you do not wish to publish to [Docker-Hub], you have to specify a server, e.g. `registry.example.com/my-image`. **Be aware that you need to provide credentials in your docker-config if the registry requires authentication. * `--tags`: sets the tags of the image. Provide multiple `--tag`-options if you wish to tag an image with multiple tags. diff --git a/assets/deployer b/assets/deployer index ef5fcc0142dbac1a197541c266099592f1d504bf..6cc36675ffcfef24ee0f7e96332c550b47bfed6a 100755 --- a/assets/deployer +++ b/assets/deployer @@ -437,6 +437,7 @@ fi case $1 in build) + import_image build_image && save_image ;; publish)