fix source for s3 (fixes #3)

.drone.yml

@@ -7,7 +7,7 @@ platform:
 
 steps:
 - name: build
-  image: balenalib/armv7hf-golang
+  image: johndockenson/runner-armhf
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -19,21 +19,12 @@ steps:
   - git fetch --tags
   - df -h
   - losetup -a
-  - apt-get update
-  - apt-get dist-upgrade -y
-  - apt-get install kpartx parted wget curl jq aria2 unzip python3 python3-pip qemu-user-static dmsetup g++-arm-linux-gnueabihf nodejs npm git apt-transport-https ca-certificates gnupg-agent software-properties-common -y
-  - curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-  - apt-key fingerprint 0EBFCD88
-  - add-apt-repository "deb [arch=armhf] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-  - apt-get update
-  - apt-get install docker-ce -y
-  - python3 -m pip install requests
   - dmsetup remove_all
   - losetup -D
   - bash -c 'export GITHUB_KEY="$GITHUB_KEY";mkdir images && PATH=./node_modules/.bin:$PATH ./builder --noninteractive --armhf' # --arm64 or --armhf, need to implement in builder
 
-- name: deploy-experiment
-  image: balenalib/armv7hf-golang
+- name: deploy
+  image: johndockenson/runner-armhf
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -43,81 +34,51 @@ steps:
   privileged: true
   commands:
   - pwd
-  - apt-get update
-  - apt-get install rsync git ssh -y
   #- git fetch --tags
   - echo "$ssh_deploy_key" | base64 --decode --ignore-garbage > .drone/id_deploy
   - .drone/environment.sh
   - echo "$experiment"
   - echo "$image_path"
-  - .drone/compress.sh
+  - .drone/compress.sh #split these steps!
   - .drone/upload.sh
   when:
-    branch:
-      exclude:
-        - master
     event:
       include:
         - tag
 
-- name: s3-experiment
+- name: s3-master
   image: plugins/s3
   settings:
     bucket: treehouses
     access_key:
       from_secret: aws_id
     secret_key:
       from_secret: aws_secret
-    source: /**/build/* # build/*
-    target: / #strip_prefix: build/
-  when:
-    branch:
-      exclude:
-        - master
-    event:
-      include:
-        - tag
-
-- name: deploy-master
-  image: balenalib/armv7hf-golang
-  volumes:
-  - name: dockersock
-    path: /var/run/docker.sock
-  environment:
-    ssh_deploy_key:
-      from_secret: ssh_secret
-  privileged: true
-  commands:
-  - pwd
-  - apt-get update
-  - apt-get install rsync git ssh -y
-  #- git fetch --tags
-  - echo "$ssh_deploy_key" | base64 --decode --ignore-garbage > .drone/id_deploy
-  - .drone/environment.sh
-  - echo "$experiment"
-  - echo "$image_path"
-  - .drone/compress.sh
-  - .drone/upload.sh
+    source: build/*
+    strip_prefix: build/
+    target: /
   when:
     branch:
     - master
     event:
       include:
         - tag
 
-- name: s3-master
+- name: s3-experiment
   image: plugins/s3
   settings:
     bucket: treehouses
     access_key:
       from_secret: aws_id
     secret_key:
       from_secret: aws_secret
-    source: /**/build/* # build/*
-    target: / #strip_prefix: build/
+    source: build/*
+    strip_prefix: build/
+    target: experiment
   when:
     branch:
-    - master
+      exclude:
+        - master
     event:
       include:
         - tag
@@ -137,7 +98,7 @@ platform:
 
 steps:
 - name: build
-  image: balenalib/aarch64-golang
+  image: johndockenson/runner-arm64
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -149,21 +110,12 @@ steps:
   - git fetch --tags
   - df -h
   - losetup -a
-  - apt-get update
-  - apt-get dist-upgrade -y
-  - apt-get install kpartx parted wget curl jq aria2 unzip python3 python3-pip qemu-user-static dmsetup g++-aarch64-linux-gnu nodejs npm git apt-transport-https ca-certificates gnupg-agent software-properties-common -y
-  - curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-  - apt-key fingerprint 0EBFCD88
-  - add-apt-repository "deb [arch=arm64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-  - apt-get update
-  - apt-get install docker-ce -y
-  - python3 -m pip install requests
   - dmsetup remove_all
   - losetup -D
   - bash -c 'export GITHUB_KEY="$GITHUB_KEY";mkdir images && PATH=./node_modules/.bin:$PATH ./builder --noninteractive --arm64'
 
-- name: deploy-experiment
-  image: balenalib/aarch64-golang
+- name: deploy
+  image: johndockenson/runner-arm64
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -173,81 +125,51 @@ steps:
   privileged: true
   commands:
   - pwd
-  - apt-get update
-  - apt-get install rsync git ssh -y
   #- git fetch --tags
   - echo "$ssh_deploy_key" | base64 --decode --ignore-garbage > .drone/id_deploy
   - .drone/environment.sh
   - echo "$experiment"
   - echo "$image_path"
-  - .drone/compress.sh
+  - .drone/compress.sh #split these steps!
   - .drone/upload.sh
   when:
-    branch:
-      exclude:
-        - master
     event:
       include:
         - tag
 
-- name: s3-experiment
+- name: s3-master
   image: plugins/s3
   settings:
     bucket: treehouses
     access_key:
       from_secret: aws_id
     secret_key:
       from_secret: aws_secret
-    source: /**/build/* # build/*
-    target: / #strip_prefix: build/
-  when:
-    branch:
-      exclude:
-        - master
-    event:
-      include:
-        - tag
-
-- name: deploy-master
-  image: balenalib/aarch64-golang
-  volumes:
-  - name: dockersock
-    path: /var/run/docker.sock
-  environment:
-    ssh_deploy_key:
-      from_secret: ssh_secret
-  privileged: true
-  commands:
-  - pwd
-  - apt-get update
-  - apt-get install rsync git ssh -y
-  #- git fetch --tags
-  - echo "$ssh_deploy_key" | base64 --decode --ignore-garbage > .drone/id_deploy
-  - .drone/environment.sh
-  - echo "$experiment"
-  - echo "$image_path"
-  - .drone/compress.sh
-  - .drone/upload.sh
+    source: build/*
+    strip_prefix: build/
+    target: /
   when:
     branch:
     - master
     event:
       include:
         - tag
 
-- name: s3-master
+- name: s3-experiment
   image: plugins/s3
   settings:
     bucket: treehouses
     access_key:
       from_secret: aws_id
     secret_key:
       from_secret: aws_secret
-    source: /**/build/* # build/*
-    target: / #strip_prefix: build/
+    source: build/*
+    strip_prefix: build/
+    target: experiment
   when:
     branch:
-    - master
+      exclude:
+        - master
     event:
       include:
         - tag
@@ -256,19 +178,6 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-
-#AWS STUFF HERE
-# steps:
-# - name: upload
-#   image: plugins/s3
-#   settings:
-#     bucket: my-bucket-name
-#     access_key:
-#       from_secret: aws_access_key_id
-#     secret_key:
-#       from_secret: aws_secret_access_key
-#     source: public/**/*
-#     target: /target/location
 
 ---
 kind: secret

install/etc/install/etc/rc.local

@@ -0,0 +1,25 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# Print the IP address
+_IP=$(hostname -I) || true
+if [ "$_IP" ]; then
+  printf "My IP address is %s\n" "$_IP"
+fi
+
+if [ -f "/etc/tunnel" ];
+then
+  /etc/tunnel
+fi
+
+exit 0

install/etc/install/etc/systemd/system/autorun.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=run autorun(once)(.sh) scripts from USB stick or in /boot
+After=local_fs.target remote_fs.target network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/local/bin/do_autorun start
+Restart=no
+
+[Install]
+WantedBy=multi-user.target

install/etc/install/etc/systemd/system/balena.service

@@ -0,0 +1,34 @@
+[Unit]
+Description=Balena Application Container Engine
+Documentation=https://www.balena.io/engine/
+After=network-online.target balena.socket firewalld.service
+Wants=network-online.target
+Requires=balena.socket
+
+[Service]
+Type=notify
+# the default is not to use systemd for cgroups because the delegate issues still
+# exists and systemd currently does not support the cgroup feature set required
+# for containers run by balena
+ExecStart=/usr/bin/balena-engine-daemon -H tcp://0.0.0.0:2375 -H unix:///var/run/balena-engine.sock
+ExecReload=/bin/kill -s HUP $MAINPID
+LimitNOFILE=1048576
+# Having non-zero Limit*s causes performance problems due to accounting overhead
+# in the kernel. We recommend using cgroups to do container-local accounting.
+LimitNPROC=infinity
+LimitCORE=infinity
+# Uncomment TasksMax if your systemd version supports it.
+# Only systemd 226 and above support this version.
+#TasksMax=infinity
+TimeoutStartSec=0
+# set delegate yes so that systemd does not reset the cgroups of balena containers
+Delegate=yes
+# kill only the balena process, not all processes in the cgroup
+KillMode=process
+# restart the balena process if it exits prematurely
+Restart=on-failure
+StartLimitBurst=3
+StartLimitInterval=60s
+
+[Install]
+WantedBy=multi-user.target

install/etc/install/etc/systemd/system/balena.socket

@@ -0,0 +1,12 @@
+[Unit]
+Description=Balena Socket for the API
+PartOf=balena.service
+
+[Socket]
+ListenStream=/var/run/balena.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=balena
+
+[Install]
+WantedBy=sockets.target

scripts.d/16_pkg_install.sh

@@ -39,6 +39,7 @@ INSTALL_PACKAGES=(
     libhdf5-dev libatlas-base-dev libqt4-test # opencv libjasper1
     imagemagick # tiv
     python3-bcrypt python3-nacl # fix slow pip
+    netcat-openbsd # ssh
 )
 
 ARMHF_PACKAGES=( #packages which do not work on arm64