Skip to content
Snippets Groups Projects
Commit 11eb64e6 authored by David Trattnig's avatar David Trattnig
Browse files

chore: update to aura UID:GID, see aura#144

parent d7180f29
No related branches found
No related tags found
No related merge requests found
Pipeline #2885 passed
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
FROM savonet/liquidsoap:v2.1.0 FROM savonet/liquidsoap:v2.1.0
LABEL maintainer="David Trattnig <david.trattnig@subsquare.at>" LABEL maintainer="David Trattnig <david.trattnig@subsquare.at>"
ENV UID=1000 ENV AURA_UID=2872
ENV GID=1000 ENV AURA_GID=2872
ENV USER=app
USER root USER root
...@@ -25,12 +24,12 @@ COPY config/sample.engine-core.docker.ini /srv/config/engine-core.ini ...@@ -25,12 +24,12 @@ COPY config/sample.engine-core.docker.ini /srv/config/engine-core.ini
COPY Makefile /srv/Makefile COPY Makefile /srv/Makefile
COPY VERSION /srv/VERSION COPY VERSION /srv/VERSION
RUN set -e \ RUN groupadd --gid ${AURA_GID} aura && \
&& adduser --home /srv --no-create-home --system --uid ${UID} --group ${USER} \ useradd --gid ${AURA_GID} --no-user-group --uid ${AURA_UID} --home-dir /srv --no-create-home aura && \
&& chown -R ${UID}:${GID} /srv /var/audio chown -R ${AURA_UID}:${AURA_GID} /srv /var/audio
USER app USER aura
WORKDIR /srv WORKDIR /srv
......
...@@ -29,6 +29,8 @@ AURA_AUDIO_STORE_SOURCE := ${CURDIR}/audio/source ...@@ -29,6 +29,8 @@ AURA_AUDIO_STORE_SOURCE := ${CURDIR}/audio/source
AURA_AUDIO_STORE_PLAYLIST := ${CURDIR}/audio/playlist AURA_AUDIO_STORE_PLAYLIST := ${CURDIR}/audio/playlist
AURA_AUDIO_STORE_FALLBACK := ${CURDIR}/audio/fallback AURA_AUDIO_STORE_FALLBACK := ${CURDIR}/audio/fallback
AURA_LOGS := ${CURDIR}/logs AURA_LOGS := ${CURDIR}/logs
AURA_UID := 2872
AURA_GID := 2872
DOCKER_RUN = @docker run \ DOCKER_RUN = @docker run \
--name $(APP_NAME) \ --name $(APP_NAME) \
...@@ -46,7 +48,7 @@ DOCKER_RUN = @docker run \ ...@@ -46,7 +48,7 @@ DOCKER_RUN = @docker run \
-v "$(AURA_AUDIO_STORE_FALLBACK)":"/var/audio/fallback":ro \ -v "$(AURA_AUDIO_STORE_FALLBACK)":"/var/audio/fallback":ro \
-v "$(AURA_LOGS)":"/srv/logs" \ -v "$(AURA_LOGS)":"/srv/logs" \
-p 1234:1234 \ -p 1234:1234 \
-u $(UID):$(GID) \ -u $(AURA_UID):$(AURA_GID) \
$(DOCKER_ENTRY_POINT) \ $(DOCKER_ENTRY_POINT) \
autoradio/$(APP_NAME) autoradio/$(APP_NAME)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment