diff --git a/CHANGELOG.md b/CHANGELOG.md index 992349a4..e9d45ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog -## [1.2.0] - Unreleased +## [1.2.0] - 2020-06-15 ### Added - Add multiarch support. Thanks to @ndanyluk and @anagno ! + - Allow usage of additional hostnames in self signed certificate #19. Thanks to @Bobonium ### Changed - Use debian buster-slim as baseimage @@ -158,6 +159,7 @@ ## 0.1.0 - 2015-07-23 Initial release +[1.2.0]: https://github.com/osixia/docker-light-baseimage/compare/v1.1.2...v1.2.0 [1.1.2]: https://github.com/osixia/docker-light-baseimage/compare/v1.1.1...v1.1.2 [1.1.1]: https://github.com/osixia/docker-light-baseimage/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/osixia/docker-light-baseimage/compare/v1.0.0...v1.1.0 diff --git a/Makefile b/Makefile index b3bc5b7f..ac8390ee 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/light-baseimage -VERSION = latest +VERSION = 1.2.0 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 0d7229b2..75547675 100644 --- a/README.md +++ b/README.md @@ -18,52 +18,52 @@ Other base distribution are available: Table of Contents - [osixia/light-baseimage](#osixialight-baseimage) - - [Contributing](#Contributing) - - [Overview](#Overview) - - [Quick Start](#Quick-Start) - - [Image directories structure](#Image-directories-structure) - - [Service directory structure](#Service-directory-structure) - - [Create a single process image](#Create-a-single-process-image) - - [Overview](#Overview-1) - - [Dockerfile](#Dockerfile) - - [Service files](#Service-files) + - [Contributing](#contributing) + - [Overview](#overview) + - [Quick Start](#quick-start) + - [Image directories structure](#image-directories-structure) + - [Service directory structure](#service-directory-structure) + - [Create a single process image](#create-a-single-process-image) + - [Overview](#overview-1) + - [Dockerfile](#dockerfile) + - [Service files](#service-files) - [startup.sh](#startupsh) - [process.sh](#processsh) - - [Environment files](#Environment-files) + - [Environment files](#environment-files) - [default.yaml](#defaultyaml) - [default.startup.yaml](#defaultstartupyaml) - - [Build and test](#Build-and-test) - - [Overriding default environment files at run time:](#Overriding-default-environment-files-at-run-time) - - [Create a multiple process image](#Create-a-multiple-process-image) - - [Overview](#Overview-2) - - [Dockerfile](#Dockerfile-1) - - [Service files](#Service-files-1) + - [Build and test](#build-and-test) + - [Overriding default environment files at run time:](#overriding-default-environment-files-at-run-time) + - [Create a multiple process image](#create-a-multiple-process-image) + - [Overview](#overview-2) + - [Dockerfile](#dockerfile-1) + - [Service files](#service-files-1) - [install.sh](#installsh) - [process.sh](#processsh-1) - - [Build and test](#Build-and-test-1) - - [Images Based On Light-Baseimage](#Images-Based-On-Light-Baseimage) - - [Image Assets](#Image-Assets) - - [Tools](#Tools) - - [Services available](#Services-available) - - [Advanced User Guide](#Advanced-User-Guide) - - [Service available](#Service-available) - - [Fix docker mounted file problems](#Fix-docker-mounted-file-problems) - - [Distribution packages documentation and locales](#Distribution-packages-documentation-and-locales) - - [Mastering image tools](#Mastering-image-tools) + - [Build and test](#build-and-test-1) + - [Images Based On Light-Baseimage](#images-based-on-light-baseimage) + - [Image Assets](#image-assets) + - [Tools](#tools) + - [Services available](#services-available) + - [Advanced User Guide](#advanced-user-guide) + - [Service available](#service-available) + - [Fix docker mounted file problems](#fix-docker-mounted-file-problems) + - [Distribution packages documentation and locales](#distribution-packages-documentation-and-locales) + - [Mastering image tools](#mastering-image-tools) - [run](#run) - - [Run command line options](#Run-command-line-options) - - [Run directory setup](#Run-directory-setup) - - [Startup files environment setup](#Startup-files-environment-setup) - - [Startup files execution](#Startup-files-execution) - - [Process execution](#Process-execution) - - [Single process image](#Single-process-image) - - [Multiple process image](#Multiple-process-image) - - [No process image](#No-process-image) - - [Extra environment variables](#Extra-environment-variables) + - [Run command line options](#run-command-line-options) + - [Run directory setup](#run-directory-setup) + - [Startup files environment setup](#startup-files-environment-setup) + - [Startup files execution](#startup-files-execution) + - [Process execution](#process-execution) + - [Single process image](#single-process-image) + - [Multiple process image](#multiple-process-image) + - [No process image](#no-process-image) + - [Extra environment variables](#extra-environment-variables) - [log-helper](#log-helper) - [complex-bash-env](#complex-bash-env) - - [Tests](#Tests) - - [Changelog](#Changelog) + - [Tests](#tests) + - [Changelog](#changelog) ## Contributing @@ -754,7 +754,7 @@ The container environment is then exported to /container/run/environment and in If a main command is set for example: - docker run -it osixia/openldap:1.1.0 bash + docker run -it osixia/openldap:1.4.0 bash *Run tool* will execute the single process and the main command. If the main command exits the container exits. This is useful to debug or image development purpose. @@ -764,7 +764,7 @@ In a multiple process image *run tool* execute runit witch supervise /container/ If a main command is set for example: - docker run -it osixia/phpldapadmin:0.6.7 bash + docker run -it osixia/phpldapadmin:0.9.0 bash *run tool* will execute runit and the main command. If the main command exits the container exits. This is still useful to debug or image development purpose.