From 4d84e4d0f90db535a94f6433ac8b7b5563bf9407 Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 22 Mar 2020 02:02:04 -0700 Subject: [PATCH] latest, still doesn't build yet --- Dockerfile | 20 ++++++++++++++------ Makefile | 4 ++-- root/etc/service/adchpp/run | 4 ++++ 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 root/etc/service/adchpp/run diff --git a/Dockerfile b/Dockerfile index ba5ccae..98bbd73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,18 +13,25 @@ mv /etc/apt/sources.list.new /etc/apt/sources.list COPY ./root /tmp/rootoverlay -# we only install essential system packages here -ARG SYSTEM_PACKAGES="build-essential golang ca-certificates git rsync runit locales" - RUN \ apt update && \ apt -y upgrade && \ - apt -y install $SYSTEM_PACKAGES && \ + apt -y install \ + build-essential \ + ca-certificates \ + git \ + golang \ + locales \ + python2 \ + rsync \ + runit \ + && \ go get -v -u github.com/peterbourgon/runsvinit && \ cp /root/go/bin/runsvinit /usr/local/sbin/runsvinit && \ rsync -avP /tmp/rootoverlay/ / && \ rm -rf /tmp/rootoverlay && \ - rm -r /root/go + rm -r /root/go && \ + chmod a+rx /etc/service/*/run CMD ["/usr/local/sbin/runsvinit"] @@ -32,7 +39,8 @@ COPY ./src /usr/local/src/adchpp RUN \ cd /usr/local/src/adchpp && \ - python + python2 build_util.py && \ + ls EXPOSE 411 diff --git a/Makefile b/Makefile index b4e480f..1075de9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -export DOCKER_HOST := ssh://datavi.be +export DOCKER_HOST := ssh://las1.local default: build build: - docker build -t sneak/adchpp --build-arg UBUNTU_MIRROR="http://ubuntu.datavi.be/ubuntu" . + docker build -t sneak/adchpp --build-arg UBUNTU_MIRROR="http://us.archive.ubuntu.com/ubuntu" . diff --git a/root/etc/service/adchpp/run b/root/etc/service/adchpp/run new file mode 100644 index 0000000..f2e7bd8 --- /dev/null +++ b/root/etc/service/adchpp/run @@ -0,0 +1,4 @@ +#!/bin/bash + +# FIXME(sneak) make this run +sleep 60