Merge pull request #32 from bspeice/master

WIP: Bring odroid-c2 back up to date

Author: StefanScherer

.circleci/config.yml

@@ -0,0 +1,43 @@
+version: 2
+jobs:
+  build:
+    machine: true
+    steps:
+      - checkout
+
+      - run:
+         name: Run Shellcheck
+         command: |
+           make shellcheck
+
+      - run:
+          name: Create SD image
+          command: |
+            VERSION=${CIRCLE_TAG} make sd-image
+      - run:
+          name: Prepare artifacts
+          command: |
+            mkdir -p output
+            cp hypriotos* output/
+      - store_artifacts:
+          path: /home/circleci/project/output
+
+      - deploy:
+          name: Deploy
+          command: |
+            if [ "$CIRCLE_TAG" != "" ]; then
+              curl -sSL https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip -o ghr.zip
+              unzip ghr.zip
+              if [[ $CIRCLE_TAG = *"rc"* ]]; then
+                pre=-prerelease
+              fi
+              ./ghr $pre -u hypriot $CIRCLE_TAG output/
+            fi
+workflows:
+  version: 2
+  build_and_deploy:
+    jobs:
+      - build:
+          filters:
+            tags:
+                only: /.*/

.gitignore

@@ -3,4 +3,5 @@
 *.img.zip.sha256
 *.tar.gz
 *.xz
+*-console.log
 .vagrant/

.travis.yml

@@ -1,6 +1,6 @@
 # image-builder-odroid-c2
 [![Join the chat at https://gitter.im/hypriot/talk](https://badges.gitter.im/hypriot/talk.svg)](https://gitter.im/hypriot/talk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/hypriot/image-builder-odroid-c2.svg)](https://travis-ci.org/hypriot/image-builder-odroid-c2)
+[![CircleCI](https://circleci.com/gh/hypriot/image-builder-odroid-c2.svg?style=svg)](https://circleci.com/gh/hypriot/image-builder-odroid-c2)
 
 This repo builds the SD card image with HypriotOS for the ODROID C2 ARM 64bit board. To build this SD card image we have to
 

README.md

@@ -1,10 +1,11 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "boxcutter/ubuntu1404"
+  config.vm.box = "ubuntu/xenial64"
 
-  config.vm.network "forwarded_port", guest: 2376, host: 2376, auto_correct: true
+  config.vm.network "forwarded_port", guest: 2375, host: 2375, auto_correct: true
   config.vm.synced_folder ".", "#{`pwd`.chomp}"
 
   config.vm.provider "vmware_fusion" do |v|
@@ -15,13 +16,31 @@ Vagrant.configure(2) do |config|
   config.vm.provider "virtualbox" do |vb|
     # Customize the amount of memory on the VM:
     vb.memory = "2048"
+    vb.cpus = 4
   end
 
   config.vm.provision "shell", inline: <<-SHELL
-     sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-     echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list
-     sudo apt-get update
-     sudo apt-get install -y linux-image-extra-$(uname -r)
-     sudo apt-get install -y docker-engine
+    sudo apt-get update
+    sudo apt-get install -y \
+      apt-transport-https \
+      ca-certificates \
+      curl \
+      software-properties-common
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+    sudo add-apt-repository \
+      "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+      $(lsb_release -cs) \
+      stable"
+    sudo apt-get update
+    sudo apt-get install docker-ce -y
+    mkdir -p /etc/systemd/system/docker.service.d/
+    # https://docs.docker.com/engine/admin/#troubleshoot-conflicts-between-the-daemonjson-and-startup-scripts
+    echo "[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd" > /etc/systemd/system/docker.service.d/docker.conf
+    echo '{ "hosts": ["tcp://0.0.0.0:2375"] }' > /etc/docker/daemon.json
+     sudo systemctl daemon-reload
+     sudo systemctl enable docker
+     sudo systemctl restart docker
   SHELL
 end

Vagrantfile

@@ -8,6 +8,7 @@ if [ ! -f /.dockerenv ]; then
 fi
 
 # get versions for software that needs to be installed
+# shellcheck disable=SC1091
 source /workspace/versions.config
 
 ### setting up some important variables to control the build process
@@ -21,15 +22,21 @@ BUILD_PATH="/build"
 ROOTFS_TAR="rootfs-arm64-debian-${HYPRIOT_OS_VERSION}.tar.gz"
 ROOTFS_TAR_PATH="$BUILD_RESULT_PATH/$ROOTFS_TAR"
 
-# Show TRAVSI_TAG in travis builds
-echo TRAVIS_TAG="${TRAVIS_TAG}"
+# Show CIRCLE_TAG in travis builds
+echo CIRCLE_TAG="${TRAVIS_TAG}"
 
 # name of the sd-image we gonna create
 HYPRIOT_IMAGE_VERSION=${VERSION:="dirty"}
 HYPRIOT_IMAGE_NAME="hypriotos-odroid-c2-${HYPRIOT_IMAGE_VERSION}.img"
 QEMU_ARCH="aarch64"
 export HYPRIOT_IMAGE_VERSION
 
+# fix a buggy version of supermin
+# TODO(bspeice): Should be fixed at image-builder level, not here
+echo "deb http://httpredir.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
+apt-get update
+apt-get install supermin=5.1.19-1~bpo9+1
+
 # create build directory for assembling our image filesystem
 rm -rf $BUILD_PATH
 mkdir -p $BUILD_PATH
@@ -119,9 +126,6 @@ guestfish -a "/${HYPRIOT_IMAGE_NAME}" << _EOF_
   copy-file-to-device /boot/u-boot.bin /dev/sda destoffset:49664 sparse:true
 _EOF_
 
-# ensure that the travis-ci user can access the SD card image file
-umask 0000
-
 # compress image
 pigz --zip -c "${HYPRIOT_IMAGE_NAME}" > "${BUILD_RESULT_PATH}/${HYPRIOT_IMAGE_NAME}.zip"
 cd ${BUILD_RESULT_PATH} && sha256sum "${HYPRIOT_IMAGE_NAME}.zip" > "${HYPRIOT_IMAGE_NAME}.zip.sha256" && cd -

builder/build.sh

@@ -39,6 +39,29 @@ function clean_print(){
   fi
 }
 
+function try_gpg_receive(){
+  set +e
+
+  GPG_KEY="$1"
+
+  counter=0;
+  status=1;
+
+  while [[ $counter -lt 5 && $status -ne 0 ]]; do
+      apt-key adv --keyserver "$KEYSERVER" --recv-keys "$GPG_KEY"
+      status=$?
+      ((counter+=1))
+
+      if [[ $status -ne 0 ]]; then
+          sleep 1
+      fi
+  done
+
+  set -e
+  
+  return $status
+}
+
 
 function get_gpg(){
   GPG_KEY="${1}"
@@ -53,8 +76,7 @@ function get_gpg(){
     wget -q -O "${KEY_FILE}" "${KEY_URL}"
   elif [[ -z "${KEY_URL}" ]]; then
     echo "no source given try to load from key server"
-#    gpg --keyserver "${KEYSERVER}" --recv-keys "${GPG_KEY}"
-    apt-key adv --keyserver "${KEYSERVER}" --recv-keys "${GPG_KEY}"
+    try_gpg_receive "$GPG_KEY"
     return $?
   else
     echo "keyfile given"
@@ -100,36 +122,38 @@ mkdir -p "$(dirname "${DEST}")"
 echo "nameserver 8.8.8.8" > "${DEST}"
 
 # set up debian jessie backports
-echo "deb http://httpredir.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
+echo "deb http://httpredir.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/jessie-backports.list
+
+# update all apt repository lists
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get upgrade -y
+
+# dirmngr needed for gpg
+apt-get -y install --no-install-recommends dirmngr
 
 # set up ODROID repository
 ODROID_KEY_ID=AB19BAC9
 get_gpg $ODROID_KEY_ID
 echo "deb http://deb.odroid.in/c2/ xenial main" > /etc/apt/sources.list.d/odroid.list
 
-# set up hypriot arm repository for odroid packages
-PACKAGECLOUD_FPR=418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB
-PACKAGECLOUD_KEY_URL=https://packagecloud.io/gpg.key
-get_gpg "${PACKAGECLOUD_FPR}" "${PACKAGECLOUD_KEY_URL}"
-
-# set up hypriot schatzkiste repository for generic packages
-echo 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ jessie main' >> /etc/apt/sources.list.d/hypriot.list
+# set up Docker engine repository
+DOCKER_KEY_ID=0EBFCD88
+get_gpg $DOCKER_KEY_ID
+echo "deb https://download.docker.com/linux/debian stretch stable" > /etc/apt/sources.list.d/docker.list
 
-# add armhf as additional architecure (see below)
-dpkg --add-architecture armhf
-
-# update all apt repository lists
-export DEBIAN_FRONTEND=noninteractive
+# update apt after adding repositories
 apt-get update
-apt-get upgrade -y
 
-# define packages to install
+# packages needed for the rest of the system
 packages=(
     # as the Odroid C2 does not have a hardware clock we need a fake one
     fake-hwclock
 
-    # install device-init
-    device-init:armhf=${DEVICE_INIT_VERSION}
+    # make sure some extra kernel tools are prepared
+    initramfs-tools
+
+    cloud-init
 
     # install dependencies for docker-tools
     lxc
@@ -142,18 +166,26 @@ packages=(
 
     # required to install docker-compose
     python-pip
+    python-setuptools
+    python-wheel
 )
 
-apt-get -y install --no-install-recommends ${packages[*]}
+apt-get -y install --no-install-recommends "${packages[@]}"
+
+# set up cloud-init
+sed -i '/disable_root: true/a apt_preserve_sources_list: true' /etc/cloud/cloud.cfg
+
+mkdir -p /var/lib/cloud/seed/nocloud-net
+ln -s /boot/user-data /var/lib/cloud/seed/nocloud-net/user-data
+ln -s /boot/meta-data /var/lib/cloud/seed/nocloud-net/meta-data
 
 # install docker-engine
-DOCKER_DEB=$(mktemp)
-wget -q -O "$DOCKER_DEB" "$DOCKER_DEB_URL"
-echo "${DOCKER_DEB_CHECKSUM} ${DOCKER_DEB}" | sha256sum -c -
-dpkg -i "$DOCKER_DEB"
+apt-get -y install docker-ce="${DOCKER_CE_VERSION}"
+curl -sSL https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker -o /etc/bash_completion.d/docker
 
 # install docker-compose
 pip install docker-compose=="${DOCKER_COMPOSE_VERSION}"
+curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
 
 # install docker-machine
 curl -L "https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine-$(uname -s)-$(uname -m)" > /usr/local/bin/docker-machine

builder/chroot-script.sh

@@ -100,7 +100,7 @@ setenv monitor_onoff "false" # true or false
 # Server Mode (aka. No Graphics)
 # Setting nographics to 1 will disable all video subsystem
 # This mode is ideal of server type usage. (Saves ~300Mb of RAM)
-setenv nographics "0"
+# setenv nographics "1"
 
 # Meson Timer
 # 1 - Meson Timer