Docker toolchain

Cargo.toml

@@ -29,7 +29,7 @@ hlua = "0.4.1"
 aabb-quadtree = "0.1.0"
 zstd = "0.4.14"
 stopwatch = "0.0.7"
-atomic = {version = "0.4", features = ["nightly"]}
+atomic = {version = "= 0.4.0", features = ["nightly"]}
 
 [features]
 enable-runtime-benchmarking = []

Makefile

@@ -7,6 +7,25 @@ examples:
 bench:
 	cargo build --examples --release --target=armv7-unknown-linux-gnueabihf --features "enable-runtime-benchmarking"
 
+.PHONY: docker-env
+docker-env:
+	cd docker-toolchain && docker build \
+		--build-arg UNAME=builder \
+		--build-arg UID=$(shell id -u) \
+		--build-arg GID=$(shell id -g) \
+		--tag rust-build-remarkable:latest .
+
+examples-docker: docker-env
+	docker volume create cargo-registry
+	docker run \
+		--rm \
+		--user builder \
+		-v $(shell pwd):/home/builder/libremarkable:rw \
+		-v cargo-registry:/home/builder/.cargo/registry \
+		-w /home/builder/libremarkable \
+		rust-build-remarkable:latest \
+		cargo build --examples --release --target=armv7-unknown-linux-gnueabihf
+
 library:
 	cargo build --release --target=armv7-unknown-linux-gnueabihf
 
@@ -15,11 +34,15 @@ test:
 	cargo test
 
 DEVICE_IP ?= "10.11.99.1"
-run: examples
+deploy-demo:
 	ssh root@$(DEVICE_IP) 'kill -9 `pidof demo` || true; systemctl stop xochitl || true'
 	scp ./target/armv7-unknown-linux-gnueabihf/release/examples/demo root@$(DEVICE_IP):~/
 	ssh root@$(DEVICE_IP) './demo'
 
+run: examples deploy-demo
+
+run-docker: examples-docker deploy-demo
+
 live: examples
 	ssh root@$(DEVICE_IP) 'kill -9 `pidof live` || true'
 	scp ./target/armv7-unknown-linux-gnueabihf/release/examples/live root@$(DEVICE_IP):~/

docker-toolchain/.cargo/config

@@ -0,0 +1,2 @@
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"

docker-toolchain/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:16.04
+LABEL maintainer='Charlton Rodda'
+
+# Need to specify UID and GID so they match the external user.
+# UNAME has no significance.
+ARG UNAME=builder
+ARG UID=1000
+ARG GID=1000
+
+RUN apt-get -qq update
+RUN apt-get -qq install curl build-essential gcc-arm-linux-gnueabihf vim
+
+RUN groupadd -g $GID $UNAME
+RUN useradd -u $UID -g $GID -m $UNAME
+USER $UNAME
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
+ENV PATH="${PATH}:/home/$UNAME/.cargo/bin"
+
+RUN rustup target add armv7-unknown-linux-gnueabihf
+
+# make the registry folder to ensure correct permissions
+RUN mkdir -p "/home/$UNAME/.cargo/registry"
+
+ADD ./.cargo/config /home/$UNAME/.cargo/config

src/lib.rs

@@ -1,5 +1,4 @@
 #![feature(integer_atomics)]
-#![feature(const_size_of)]
 #![feature(box_syntax)]
 #![feature(nll)]