From a4b1e29ce143a358d169acafe8192f5d479ea52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=90=E4=BA=9A=E7=91=9F?= Date: Sat, 22 Jun 2024 22:53:04 +0800 Subject: [PATCH] feat: add docker UMASK, PUID, PGID setting support (#588) --- Dockerfile.GitHubActions | 28 ++++++++++++++++++++++++++-- docker-entrypoint.sh | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 docker-entrypoint.sh diff --git a/Dockerfile.GitHubActions b/Dockerfile.GitHubActions index 8449006..ced2c88 100644 --- a/Dockerfile.GitHubActions +++ b/Dockerfile.GitHubActions @@ -1,9 +1,33 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0 ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +ENV GOSU_VERSION=1.17 + +ENV UMASK=022 +ENV PUID=1000 +ENV PGID=1000 + + WORKDIR /app VOLUME [ "/rec" ] + +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh COPY ./BililiveRecorder.Cli/bin/docker_out /app -ENTRYPOINT [ "dotnet", "/app/BililiveRecorder.Cli.dll" ] + +RUN apt-get update && \ + apt-get install -y wget && \ + rm -rf /var/lib/apt/lists/* && \ + useradd -r -g users user && \ + chmod a+x /usr/local/bin/docker-entrypoint.sh && \ + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \ + echo $TZ > /etc/timezone + +ARG TARGETPLATFORM + +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64; fi; if [ "$TARGETPLATFORM" = "linux/arm64" ]; then wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-arm64; fi; if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-armhf; fi + +RUN chmod +x /usr/local/bin/gosu + EXPOSE 2356/tcp + +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] CMD [ "run", "--bind", "http://*:2356", "/rec" ] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 0000000..04754af --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +umask $UMASK + +usermod -u $PUID user +groupmod -g $PGID users + +chown -R user:users /app +chown -R user:users /rec + +export HOME=/home/user + +exec /usr/local/bin/gosu user dotnet /app/BililiveRecorder.Cli.dll $@