Parameterise the UID of the worker user in the docker build file. (#517)
* Parameterise the UID of the worker user in the docker build file. Signed-off-by: Alex Jones <alex.jones@unclealex.co.uk> * Remove spurious use of ARG uid so that it only appears after the FROM statement. Signed-off-by: Alex Jones <alex.jones@unclealex.co.uk>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
FROM debian:buster
|
||||
ARG optical_gid
|
||||
ARG uid=1000
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||
autoconf \
|
||||
@@ -55,7 +56,7 @@ RUN curl -o - "https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-${LIBCDIO_PARANO
|
||||
RUN ldconfig
|
||||
|
||||
# add user (+ group workaround for ArchLinux)
|
||||
RUN useradd -m worker -G cdrom \
|
||||
RUN useradd -m worker --uid ${uid} -G cdrom \
|
||||
&& if [ -n "${optical_gid}" ]; then groupadd -f -g "${optical_gid}" optical \
|
||||
&& usermod -a -G optical worker; fi \
|
||||
&& mkdir -p /output /home/worker/.config/whipper \
|
||||
|
||||
@@ -84,7 +84,7 @@ Building the Docker image locally is required in order to make it work on Arch L
|
||||
|
||||
To build the Docker image locally just issue the following command (it relies on the [Dockerfile](https://github.com/whipper-team/whipper/blob/develop/Dockerfile) included in whipper's repository):
|
||||
|
||||
`optical_gid=$(getent group optical | cut -d: -f3) docker build --build-arg optical_gid -t whipperteam/whipper .`
|
||||
`optical_gid=$(getent group optical | cut -d: -f3) uid=$(id -u) docker build --build-arg optical_gid --build-arg uid -t whipperteam/whipper .`
|
||||
|
||||
It's recommended to create an alias for a convenient usage:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user