diff --git a/CHANGELOG.md b/CHANGELOG.md index ae0e8541..4667fcf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +# [1.3.2] - 2021-02-18 +### Fixed + - Remove -x bash flag on log-helper tool + # [1.3.1] - 2021-01-24 ### Fixed - Update expired default-ca #30 #29. Thanks to @heidemn @@ -168,6 +172,7 @@ ## 0.1.0 - 2015-07-23 Initial release +[1.3.2]: https://github.com/osixia/docker-light-baseimage/compare/v1.3.1...v1.3.2 [1.3.1]: https://github.com/osixia/docker-light-baseimage/compare/v1.3.0...v1.3.1 [1.3.0]: https://github.com/osixia/docker-light-baseimage/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/osixia/docker-light-baseimage/compare/v1.1.2...v1.2.0 diff --git a/Makefile b/Makefile index 3a8f61c7..7f55fa5f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/light-baseimage -VERSION = 1.3.1 +VERSION = 1.3.2 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index aa73fc70..71e39cb7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/light-baseimage/ -Latest release: 1.3.1 [Changelog](CHANGELOG.md) +Latest release: 1.3.2 [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/light-baseimage/)  A **Debian 10 (Buster)** based docker image to build reliable image quickly. This image provide a simple opinionated solution to build multiple or single process image with minimum of layers and an optimized build. @@ -150,7 +150,7 @@ In the Dockerfile we are going to: # Use osixia/light-baseimage # https://github.com/osixia/docker-light-baseimage - FROM osixia/light-baseimage:1.3.1 + FROM osixia/light-baseimage:1.3.2 # Download nginx from apt-get and clean apt-get files RUN apt-get -y update \ @@ -392,7 +392,7 @@ In the Dockerfile we are going to: # Use osixia/light-baseimage # https://github.com/osixia/docker-light-baseimage - FROM osixia/light-baseimage:1.3.1 + FROM osixia/light-baseimage:1.3.2 # Install multiple process stack, nginx and php7.0-fpm and clean apt-get files # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-multiple-process-stack @@ -593,7 +593,7 @@ Here simple Dockerfile example how to add a service-available to an image: # Use osixia/light-baseimage # https://github.com/osixia/docker-light-baseimage - FROM osixia/light-baseimage:1.3.1 + FROM osixia/light-baseimage:1.3.2 # Add cfssl and cron service-available # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-service-available @@ -662,7 +662,7 @@ What it does: *Run tool* takes several options, to list them: - docker run osixia/light-baseimage:1.3.1 --help + docker run osixia/light-baseimage:1.3.2 --help usage: run [-h] [-e] [-s] [-p] [-f] [-o {startup,process,finish}] [-c COMMAND [WHEN={startup,process,finish} ...]] [-k] [--wait-state FILENAME] [--wait-first-startup] [--keep-startup-env] @@ -773,7 +773,7 @@ If a main command is set for example: If a main command is set *run tool* launch it otherwise bash is launched. Example: - docker run -it osixia/light-baseimage:1.3.1 + docker run -it osixia/light-baseimage:1.3.2 ##### Extra environment variables @@ -849,8 +849,8 @@ Note this yaml definition: Can also be set by command line converted in python or json: - docker run -it --env FRUITS="#PYTHON2BASH:['orange','apple']" osixia/light-baseimage:1.3.1 printenv - docker run -it --env FRUITS="#JSON2BASH:[\"orange\",\"apple\"]" osixia/light-baseimage:1.3.1 printenv + docker run -it --env FRUITS="#PYTHON2BASH:['orange','apple']" osixia/light-baseimage:1.3.2 printenv + docker run -it --env FRUITS="#JSON2BASH:[\"orange\",\"apple\"]" osixia/light-baseimage:1.3.2 printenv ### Tests diff --git a/example/multiple-process-image/Dockerfile b/example/multiple-process-image/Dockerfile index 67b45bfa..458a386e 100644 --- a/example/multiple-process-image/Dockerfile +++ b/example/multiple-process-image/Dockerfile @@ -1,6 +1,6 @@ # Use osixia/light-baseimage # https://github.com/osixia/docker-light-baseimage -FROM osixia/light-baseimage:1.3.1 +FROM osixia/light-baseimage:1.3.2 # Install multiple process stack, nginx and php7.0-fpm and clean apt-get files # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-multiple-process-stack diff --git a/example/single-process-image/Dockerfile b/example/single-process-image/Dockerfile index 1114e8b3..48a193e2 100644 --- a/example/single-process-image/Dockerfile +++ b/example/single-process-image/Dockerfile @@ -1,6 +1,6 @@ # Use osixia/light-baseimage # https://github.com/osixia/docker-light-baseimage -FROM osixia/light-baseimage:1.3.1 +FROM osixia/light-baseimage:1.3.2 # Download nginx from apt-get and clean apt-get files RUN apt-get -y update \ diff --git a/image/tool/log-helper b/image/tool/log-helper index 6deb478b..e5f9fd13 100755 --- a/image/tool/log-helper +++ b/image/tool/log-helper @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e # log helper base on environment variable CONTAINER_LOG_LEVEL # CONTAINER_LOG_LEVEL environment variable is set by run tool based on --log-level argument (info by default)