Merge branch 'release/1.1.1'

Author: mstrazds1

Changelog.md

@@ -1,11 +1,15 @@
+## 1.1.1 (release date: 2017-01-17)
+
+ * Patched ntpd so that invalid `-s` switch is removed
+
 ## 1.1.0 (release date: 2017-01-17)
 
  * Updated nginx conf sendfile default to 'off'
- * Updated NVM version to 0.33.0
- * Updated Node.js to version 6.9.4 LTS
+ * Updated NVM version to `0.33.0`
+ * Updated Node.js to version `6.9.4 LTS`
  * Added synchronise on start to the ntp daemon
- * Added 'www' folder and moved index.php
- * Added docker-compose.yml for easy setup
+ * Added `www` folder and moved index.php
+ * Added `docker-compose.yml` for easy setup
  * Update PECL channel listing
 
 ## 1.0.3 (release date: 2016-11-22)

README.md

@@ -1,9 +1,3 @@
-<p align="center">
-  <a href="http://docker.io">
-    <img height="81" width="341" src="http://upload.wikimedia.org/wikipedia/commons/7/79/Docker_(container_engine)_logo.png">
-  </a>
-</p>
------
 # nginx-php56
 A Nginx + PHP 5.6 (FPM) base container. Builds upon on the excellent [phusion/baseimage-docker](https://github.com/phusion/baseimage-docker) container. You can find the docker automated build [here](https://registry.hub.docker.com/u/mstrazds/nginx-php56/).
 

build/ntp.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-/usr/sbin/ntpd -u ntp:ntp -p /var/run/ntpd.pid -g -n -s
+/usr/sbin/ntpd -u ntp:ntp -p /var/run/ntpd.pid -g -n