rik/docker-deployment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup make/build scripts, fix newlines in scripts

Browse Source
This commit is contained in:
Rik Veenboer
2015-12-30 12:08:57 +01:00
parent 9f303d024a
commit eebfe075f9
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build
View File

@@ -1 +1 @@
$DOCKER_HOME/bin/make $1 build $DOCKER_HOME/bin/make $1 build

2
bin/make
View File

@@ -1,5 +1,5 @@
FILE=$DOCKER_HOME/images/$1.mk FILE=$DOCKER_HOME/images/$1.mk
if [[ ! -e $FILE ]]; then if [ ! -e $FILE ]; then
DELETE=true DELETE=true
FILE="$(mktemp)" FILE="$(mktemp)"
cat <<- EOF > $FILE cat <<- EOF > $FILE

10
build/Makefile
View File

@@ -1,12 +1,8 @@
RANDOM = $(shell bash -c 'echo $$RANDOM')
HOME = $(DOCKER_HOME)
BASE = $(HOME)/build
TMP = /build/tmp TMP = /build/tmp
FROM = ubuntu:trusty FROM = ubuntu:trusty
INTERFACE = eth0
MODE = normal MODE = normal
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=false
include $(wildcard $(HOME)/build/make/*.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
define add define add
@echo 'ADD $(1) $(2)' >> ${FILE} @echo 'ADD $(1) $(2)' >> ${FILE}
@@ -40,11 +36,11 @@ build: prepare base
$(call script,cleanup) $(call script,cleanup)
@echo 'RUN chmod +x /opt/init.d/* || :' >> ${FILE} @echo 'RUN chmod +x /opt/init.d/* || :' >> ${FILE}
@echo 'CMD ["/opt/init"]' >> ${FILE} @echo 'CMD ["/opt/init"]' >> ${FILE}
@docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(BASE) @docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build
@rm ${FILE} @rm ${FILE}
prepare: prepare:
@$(eval FILE = $(shell mktemp -p $(BASE))) @$(eval FILE = $(shell mktemp -p $(DOCKER_HOME)/build))
@echo FROM $(FROM) > ${FILE} @echo FROM $(FROM) > ${FILE}
@echo ENV MODE $(MODE) >> ${FILE} @echo ENV MODE $(MODE) >> ${FILE}
$(call add,config,/build/config) $(call add,config,/build/config)

14
build/scripts/backintime.sh
View File

@@ -1 +1,13 @@
#!/bin/bash #!/bin/bash
set -e
source /build/config
set -x
## Environment
## BackInTime
apt_get_install_permanent backintime-common python-dbus
## Configuration

19
build/scripts/headphones.sh
View File

@@ -1 +1,18 @@
#!/bin/bash #!/bin/bash
set -e
source /build/config
set -x
## Environment
export_env HEADPHONES_CONFIG /host/etc/headphones/config.ini
export_env HEADPHONES_CONFIG_DEFAULT /opt/headphones/config.ini
export_env HEADPHONES_DATA /host/var/lib/headphones
## Headphones
cd /opt
git clone https://github.com/rembo10/headphones.git
## Encoders
echo "deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list
apt-get update
apt_get_install_permanent --force-yes ffmpeg libmp3lame0 libavcodec-extra-54