Merge pull request #34 from docbobo/master

Updating docker-engine to v17.03.01-ce
hypriot · Mar 30, 2017 · 21a4510 · 21a4510
2 parents e15e6b4 + dba820d
commit 21a4510
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,2 @@
-*.img
-*.img.zip
-*.tar.gz
-.vagrant/
+*
+!builder
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ branches:
   only:
     - master
     - /^v\d.*$/
+    - /^feature\/.*$/
 deploy:
   provider: releases
   skip_cleanup: true

diff --git a/builder/files/etc/systemd/system/fix-hdmi.service b/builder/files/etc/systemd/system/fix-hdmi.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Enable HDMI console
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'echo 0 > /sys/devices/platform/mesonfb/graphics/fb1/blank'
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/versions.config b/versions.config
@@ -9,7 +9,7 @@ RAW_IMAGE_CHECKSUM="fe9af7686960d5d2dd6c364197e196d751f6adedd7da515ed6521c31e958
 
 # specific versions of kernel/firmware and docker tools
 export KERNEL_VERSION="3.10.104-186"
-export DOCKER_ENGINE_VERSION="17.03.0~ce-0~debian-jessie"
+export DOCKER_ENGINE_VERSION="17.03.1~ce-0~debian-jessie"
 export DOCKER_COMPOSE_VERSION="1.11.2"
 export DOCKER_MACHINE_VERSION="0.10.0"
 export DEVICE_INIT_VERSION="0.1.9"