Chore(Docker): Consolidate with Engine Docker

Dockerfile

@@ -14,15 +14,13 @@ RUN apt update --allow-releaseinfo-change && \
 # Setup Engine
 ENV TZ=Europe/Vienna
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN mkdir -p /srv/src
-RUN mkdir -p /srv/tests
-RUN mkdir -p /srv/config
+RUN mkdir -p /srv/src /srv/tests /srv/config srv/logs srv/socket
 COPY src /srv/src
 COPY tests /srv/tests
-COPY config/sample.engine-core.docker.ini /srv/config/engine-core.ini
+COPY config/sample.engine-core.docker.ini /etc/aura/engine-core.ini
 COPY Makefile /srv/Makefile
 COPY VERSION /srv/VERSION
-VOLUME ["/srv/socket", "/srv/logs", "/srv/audio/source", "/srv/audio/playlist", "/srv/audio/fallback"]
+
 #RUN chown -R liquidsoap:liquidsoap /srv
 WORKDIR /srv
 

Makefile

 -include build/base.Makefile
 -include build/docker.Makefile
 
-.PHONY: help
-help:
+
+help::
 	@echo "$(APP_NAME) targets:"
 	@echo "    init.dev        - init development environment"
 	@echo "    lint            - verify code style"
@@ -17,12 +17,13 @@ help:
 
 # Settings
 
+AURA_ENGINE_CORE_SOCKET := "aura_engine_socket"
 AURA_ENGINE_CORE_CONFIG := ${CURDIR}/config/engine-core.docker.ini
-AURA_ENGINE_CORE_SOCKET := ${CURDIR}/socket
-AURA_AUDIO_STORE := ${CURDIR}/audio
-AURA_AUDIO_STORE_SOURCE := ${AURA_AUDIO_STORE}/source
-AURA_AUDIO_STORE_FALLBACK := ${AURA_AUDIO_STORE}/fallback
-AURA_AUDIO_STORE_PLAYLIST := ${AURA_AUDIO_STORE}/playlist
+AURA_AUDIO_STORE_SOURCE := ${CURDIR}/audio/source
+AURA_AUDIO_STORE_PLAYLIST := ${CURDIR}/audio/playlist
+AURA_AUDIO_STORE_FALLBACK := ${CURDIR}/audio/fallback
+AURA_LOGS := ${CURDIR}/logs
+TIMEZONE := "Europe/Vienna"
 
 DOCKER_RUN = @docker run \
 		--name $(APP_NAME) \
@@ -30,8 +31,9 @@ DOCKER_RUN = @docker run \
 		--mount type=tmpfs,destination=/tmp \
 		--device /dev/snd \
 		--group-add audio \
-		-v "$(AURA_ENGINE_CORE_CONFIG)":"/srv/config/engine-core.ini":ro \
+		-e TZ=$(TIMEZONE) \
 		-v "$(AURA_ENGINE_CORE_SOCKET)":"/srv/socket" \
+		-v "$(AURA_ENGINE_CORE_CONFIG)":"/etc/aura/engine-core.ini":ro \
 		-v "$(AURA_AUDIO_STORE_SOURCE)":"/var/audio/source":ro \
 		-v "$(AURA_AUDIO_STORE_PLAYLIST)":"/var/audio/playlist":ro \
 		-v "$(AURA_AUDIO_STORE_FALLBACK)":"/var/audio/fallback":ro \
@@ -41,36 +43,32 @@ DOCKER_RUN = @docker run \
 
 # Targets
 
-.PHONY: lint
-lint:
+lint::
 	liquidsoap --check src/engine.liq
 
-.PHONY: spell
-spell: SPELL_PATHS := $(wildcard *.md) docs src tests config contrib
-spell: SPELL_PATHS_SKIP := src/archive
-spell: SPELL_IGNORE_FILE := .codespellignore
-spell:
+spell:: SPELL_PATHS := $(wildcard *.md) docs src tests config contrib
+spell:: SPELL_PATHS_SKIP := src/archive
+spell:: SPELL_IGNORE_FILE := .codespellignore
+spell::
 	codespell --ignore-words "$(SPELL_IGNORE_FILE)" --skip "$(SPELL_PATHS_SKIP)" $(SPELL_PATHS)
 
-.PHONY: init.dev
-init.dev:
+init.dev::
 	sudo apt install -y
 		codespell
 
-.PHONY: test
-test:
+test::
 	(cd tests && liquidsoap engine_test_suite.liq)
 
-.PHONY: log
-log:
+log::
 	tail -f logs/$(APP_NAME).log
 
-.PHONY: run
-run:
+run::
 	(cd src && liquidsoap ./engine.liq)
 
-.PHONY: run.debug
-run.debug:
+run.debug::
 	(cd src && liquidsoap --verbose --debug ./engine.liq)
 
+docker.init::
+	@echo "Creating Docker Volume for Engine Socket at '$(AURA_ENGINE_CORE_SOCKET)'"
+	docker volume create aura_engine_socket