fix: RUN groupadd useradd cmd fail

geekwho-eth · geekwho-eth · commit cb7cbb211791 · 2025-04-16T19:25:58.000+08:00
set ENV USER=bitcoin
diff --git a/25/alpine/Dockerfile b/25/alpine/Dockerfile
@@ -94,12 +94,15 @@ FROM alpine
 ARG UID=100
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 LABEL maintainer="GeekWho <caijiamx@gmail.com>"
 LABEL version="1.0"
 LABEL description="A bitcoin-core docker image"
 
-RUN addgroup bitcoin --gid ${GID} --system
-RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN addgroup ${USER} --gid ${GID} --system
+RUN adduser --uid ${UID} --system ${USER} --ingroup ${USER}
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
   libevent \
diff --git a/25/debian/Dockerfile b/25/debian/Dockerfile
@@ -37,12 +37,15 @@ FROM debian:bookworm-slim
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=25.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/25/ubuntu/Dockerfile b/25/ubuntu/Dockerfile
@@ -37,12 +37,15 @@ FROM ubuntu:23.04
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=25.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/26/alpine/Dockerfile b/26/alpine/Dockerfile
@@ -94,12 +94,15 @@ FROM alpine
 ARG UID=100
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 LABEL maintainer="GeekWho <caijiamx@gmail.com>"
 LABEL version="1.0"
 LABEL description="A bitcoin-core docker image"
 
-RUN addgroup bitcoin --gid ${GID} --system
-RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN addgroup ${USER} --gid ${GID} --system
+RUN adduser --uid ${UID} --system ${USER} --ingroup ${USER}
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
   libevent \
diff --git a/26/debian/Dockerfile b/26/debian/Dockerfile
@@ -37,12 +37,15 @@ FROM debian:bookworm-slim
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=26.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/26/ubuntu/Dockerfile b/26/ubuntu/Dockerfile
@@ -37,12 +37,15 @@ FROM ubuntu:23.04
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=26.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/27/alpine/Dockerfile b/27/alpine/Dockerfile
@@ -92,12 +92,15 @@ FROM alpine
 ARG UID=100
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 LABEL maintainer="GeekWho <caijiamx@gmail.com>"
 LABEL version="1.0"
 LABEL description="A bitcoin-core docker image"
 
-RUN addgroup bitcoin --gid ${GID} --system
-RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN addgroup ${USER} --gid ${GID} --system
+RUN adduser --uid ${UID} --system ${USER} --ingroup ${USER}
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
   libevent \
diff --git a/27/debian/Dockerfile b/27/debian/Dockerfile
@@ -37,12 +37,15 @@ FROM debian:bookworm-slim
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=27.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/27/ubuntu/Dockerfile b/27/ubuntu/Dockerfile
@@ -37,12 +37,15 @@ FROM ubuntu:23.04
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=27.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/28/alpine/Dockerfile b/28/alpine/Dockerfile
@@ -92,12 +92,15 @@ FROM alpine
 ARG UID=100
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 LABEL maintainer="GeekWho <caijiamx@gmail.com>"
 LABEL version="1.0"
 LABEL description="A bitcoin-core docker image"
 
-RUN addgroup bitcoin --gid ${GID} --system
-RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN addgroup ${USER} --gid ${GID} --system
+RUN adduser --uid ${UID} --system bitcoin --ingroup ${USER}
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
   libevent \
diff --git a/28/debian/Dockerfile b/28/debian/Dockerfile
@@ -37,12 +37,15 @@ FROM debian:bookworm-slim
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=28.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/28/ubuntu/Dockerfile b/28/ubuntu/Dockerfile
@@ -37,12 +37,15 @@ FROM ubuntu:23.04
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=28.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/29/alpine/Dockerfile b/29/alpine/Dockerfile
@@ -92,12 +92,15 @@ FROM alpine
 ARG UID=100
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 LABEL maintainer="GeekWho <caijiamx@gmail.com>"
 LABEL version="1.0"
 LABEL description="A bitcoin-core docker image"
 
-RUN addgroup bitcoin --gid ${GID} --system
-RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN addgroup ${USER} --gid ${GID} --system
+RUN adduser --uid ${UID} --system ${USER} --ingroup ${USER}
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
   libevent \
diff --git a/29/debian/Dockerfile b/29/debian/Dockerfile
@@ -37,12 +37,15 @@ FROM debian:bookworm-slim
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=29.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
diff --git a/29/ubuntu/Dockerfile b/29/ubuntu/Dockerfile
@@ -37,12 +37,16 @@ FROM ubuntu:23.04
 ARG UID=101
 ARG GID=101
 
+# 设置环境变量
+ENV USER=bitcoin
+    #HOME=/home/bitcoin
+
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV BITCOIN_VERSION=29.0
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+RUN groupadd --system --gid ${GID} ${USER} \
+  && useradd --system --create-home --no-log-init -u ${UID} -g ${GID} ${USER} \
   && apt-get update -y \
   && apt-get install -y gosu --no-install-recommends \
   && apt-get clean \
