Merge pull request #125 from hypriot/remove-cluster-lab

Remove cluster lab and pre-installed images

Makefile

@@ -3,10 +3,7 @@ default: build
 build:
 	docker build -t image-builder-rpi .
 
-get-cluster-lab-images:
-	builder/get-cluster-lab-images.sh
-
-sd-image: get-cluster-lab-images build
+sd-image: build
 	docker run --rm --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e TRAVIS_TAG -e VERSION image-builder-rpi
 
 shell: build

builder/chroot-script.sh

@@ -199,13 +199,6 @@ echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
 
-
-# install Hypriot Cluster-Lab
-apt-get install -y \
-  "hypriot-cluster-lab=${CLUSTER_LAB_VERSION}"
-# do not run cluster-lab automatically
-systemctl disable cluster-lab.service
-
 # cleanup APT cache and lists
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

builder/files/boot/device-init.yaml

@@ -1,12 +1,5 @@
 # hostname for your HypriotOS device
 hostname: black-pearl
-docker:
-  images:
-    - /var/local/rpi-consul_0.6.4.tar.gz
-    - /var/local/rpi-swarm_1.2.2.tar.gz
-clusterlab:
-  service:
-    run_on_boot: false
 
 # optional wireless network settings
 wifi:

builder/test-integration/spec/hypriotos-image/device-init_spec.rb

@@ -13,10 +13,6 @@
 describe file('/boot/device-init.yaml') do
   it { should be_file }
   its(:content) { should match /hostname: / }
-  its(:content) { should match /docker:/ }
-  its(:content) { should match /images:/ }
-  its(:content) { should match /- \/var\/local\/rpi-consul_0.6.4.tar.gz/ }
-  its(:content) { should match /- \/var\/local\/rpi-swarm_1.2.2.tar.gz/ }
 end
 
 describe file('/usr/local/bin/device-init') do

builder/test/image_spec.rb

@@ -43,26 +43,6 @@
     end
   end
 
-  context "Docker Images" do
-    let(:stdout) { run_mounted("ls /var/local").stdout }
-
-    it "Consul export file exists" do
-      expect(stdout).to contain('rpi-consul_0.6.4.tar.gz')
-    end
-
-    it "Docker Swarm export file exists" do
-      expect(stdout).to contain('rpi-swarm_1.2.2.tar.gz')
-    end
-  end
-
-  context "Docker daemon config" do
-    let(:stdout) { run_mounted("cat /etc/docker/daemon.json").stdout }
-
-    it "Daemon config is empty" do
-      expect(stdout).to contain("{\n}\n\n")
-    end
-  end
-
   context "Docker service file" do
     let(:stdout) { run_mounted("cat /etc/systemd/system/docker.service").stdout }
 

versions.config

@@ -14,8 +14,3 @@ export DOCKER_ENGINE_VERSION="1.12.1~rc1-0~jessie"
 export DOCKER_COMPOSE_VERSION="1.8.0-61"
 export DOCKER_MACHINE_VERSION="0.8.0-30"
 export DEVICE_INIT_VERSION="0.1.8"
-export CLUSTER_LAB_VERSION="0.2.14-1"
-
-# specify preloaded versions of docker images needed for the cluster-lab
-SWARM_VERSION="1.2.2"
-CONSUL_VERSION="0.6.4"