From 22fe2fbfce4e960259395f06a9fbeefcb3e37fee Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Thu, 10 Sep 2020 09:40:19 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8Docker?= =?UTF-8?q?file=E5=8F=98=E9=87=8F=E5=AE=9A=E4=B9=89=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 ++ alpine/Dockerfile | 2 ++ customer/usr/sbin/create_user | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b1ece9..8f0fa22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ FROM debian:buster-slim # APT源配置：default / tencent / ustc / aliyun / huawei ARG apt_source=tencent +ENV APP_USER=builder + LABEL \ "Version"="v10" \ "Description"="Docker image for Builder based on Debian." \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 245557e..e9afb2c 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -8,6 +8,8 @@ FROM alpine:3.12 # APK源配置：default / tencent / ustc / aliyun / huawei ARG apt_source=tencent +ENV APP_USER=builder + LABEL \ "Version"="v3.12" \ "Description"="Docker image for Builder based on Alpine." \ diff --git a/customer/usr/sbin/create_user b/customer/usr/sbin/create_user index f5be01e..95b2598 100755 --- a/customer/usr/sbin/create_user +++ b/customer/usr/sbin/create_user @@ -1,9 +1,9 @@ #!/bin/bash # shell 执行参数，分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) set -eux -groupadd --gid 998 --system builder -useradd --gid 998 --uid 999 --shell /bin/bash --home /srv/data --system builder +groupadd --gid 998 --system ${APP_USER} +useradd --gid 998 --uid 999 --shell /bin/bash --home /srv/data --system ${APP_USER} # 如果需要 sudo 权限，需要安装 su 软件包：apk add sudo sed -i -e 's/^\sDefaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers -echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \ No newline at end of file +echo "${APP_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \ No newline at end of file