Merge branch 'release-1.1.1' into stable

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.1.1
+  - chmod 444 logrotate config files
+  - fix jsonssl-helper get traefik ca certificate on alpine
+
 # 1.1.0
   - Use debian stretch-slim as baseimage
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/light-baseimage
-VERSION = 1.1.0
+VERSION = 1.1.1
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -6,7 +6,7 @@
 
 [hub]: https://hub.docker.com/r/osixia/light-baseimage/
 
-Latest release: 1.1.0 (debian stretch) - 1.0.1 (debian jessie) [Changelog](CHANGELOG.md)
+Latest release: 1.1.1 (debian stretch) - 1.0.1 (debian jessie) [Changelog](CHANGELOG.md)
  | [Docker Hub](https://hub.docker.com/r/osixia/light-baseimage/) 
 
 A Debian 9 (Stretch) 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.
@@ -143,7 +143,7 @@ In the Dockerfile we are going to:
 
         # Use osixia/light-baseimage
         # https://github.com/osixia/docker-light-baseimage
-        FROM osixia/light-baseimage:1.1.0
+        FROM osixia/light-baseimage:1.1.1
         MAINTAINER Your Name <[email protected]>
 
         # Download nginx from apt-get and clean apt-get files
@@ -386,7 +386,7 @@ In the Dockerfile we are going to:
 
       # Use osixia/light-baseimage
       # https://github.com/osixia/docker-light-baseimage
-      FROM osixia/light-baseimage:1.1.0
+      FROM osixia/light-baseimage:1.1.1
       MAINTAINER Your Name <[email protected]>
 
       # Install multiple process stack, nginx and php7.0-fpm and clean apt-get files
@@ -588,7 +588,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.1.0
+        FROM osixia/light-baseimage:1.1.1
         MAINTAINER Your Name <[email protected]>
 
         # Add cfssl and cron service-available
@@ -658,7 +658,7 @@ What it does:
 
 *Run tool* takes several options, to list them:
 
-    docker run osixia/light-baseimage:1.1.0 --help
+    docker run osixia/light-baseimage:1.1.1 --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]
@@ -769,7 +769,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.1.0
+    docker run -it osixia/light-baseimage:1.1.1
 
 
 ##### Extra environment variables
@@ -845,8 +845,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.1.0 printenv
-    docker run -it --env FRUITS="#JSON2BASH:[\"orange\",\"apple\"]" osixia/light-baseimage:1.1.0 printenv
+    docker run -it --env FRUITS="#PYTHON2BASH:['orange','apple']" osixia/light-baseimage:1.1.1 printenv
+    docker run -it --env FRUITS="#JSON2BASH:[\"orange\",\"apple\"]" osixia/light-baseimage:1.1.1 printenv
 
 ### Tests
 

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.1.0
+FROM osixia/light-baseimage:1.1.1
 MAINTAINER Your Name <[email protected]>
 
 # Install multiple process stack, nginx and php7.0-fpm and clean apt-get files

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.1.0
+FROM osixia/light-baseimage:1.1.1
 MAINTAINER Your Name <[email protected]>
 
 # Download nginx from apt-get and clean apt-get files

image/service-available/:logrotate/startup.sh

@@ -3,4 +3,6 @@ log-helper level eq trace && set -x
 ln -sf ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/logrotate.conf /etc/logrotate.conf
 ln -sf ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/logrotate_syslogng /etc/logrotate.d/syslog-ng
 
+chmod 444 -R ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/*
+
 exit 0

image/service-available/:ssl-tools/assets/tool/jsonssl-helper

@@ -61,7 +61,7 @@ if [ ! -e "$CERT_FILE" ] && [ ! -e "$KEY_FILE" ]; then
   if [ "${JSONSSL_PROFILE,,}" = "traefik" ]; then
     # Let's Encrypt CA certificate is in cert file after the domain certificate.
     # So we took what's after the first cert.
-    JSONSSL_GET_CA_CERT_CMD="cat $CERT_FILE | sed '0,/END CERTIFICATE/d'"
+    JSONSSL_GET_CA_CERT_CMD="awk '{if(found) print} /END CERTIFICATE/{found=1}' $CERT_FILE"
 
     JSONSSL_GET_CERT_CMD="cat $JSONSSL_FILE | jq -r '[.[\"DomainsCertificate\"].Certs[].Certificate] | map(select(.Domain == \"$JSONSSL_HOSTNAME\")) | .[0].Certificate' | base64 -d"
     JSONSSL_GET_KEY_CMD="cat $JSONSSL_FILE | jq -r '[.[\"DomainsCertificate\"].Certs[].Certificate] | map(select(.Domain == \"$JSONSSL_HOSTNAME\")) | .[0].PrivateKey' | base64 -d"