Skip to content

Commit b5505ea

Browse files
authored
Simplify Dockerfile (zcash#6906)
1 parent 7a93b4f commit b5505ea

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

contrib/docker/Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:11
1+
FROM debian:12
22

33
RUN apt-get update \
44
&& apt-get install -y gnupg2 apt-transport-https curl
@@ -14,7 +14,7 @@ ARG ZCASHD_USER=zcashd
1414
ARG ZCASHD_UID=2001
1515

1616
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $ZCASH_SIGNING_KEY_ID \
17-
&& echo "deb [arch=amd64] https://apt.z.cash/ bullseye main" > /etc/apt/sources.list.d/zcash.list \
17+
&& echo "deb [arch=amd64] https://apt.z.cash/ bookworm main" > /etc/apt/sources.list.d/zcash.list \
1818
&& apt-get update
1919

2020
RUN if [ -z "$ZCASH_VERSION" ]; \
@@ -23,15 +23,18 @@ RUN if [ -z "$ZCASH_VERSION" ]; \
2323
fi; \
2424
zcashd --version
2525

26-
RUN useradd --home-dir /srv/$ZCASHD_USER \
26+
RUN useradd --home-dir "/srv/$ZCASHD_USER" \
2727
--shell /bin/bash \
2828
--create-home \
29-
--uid $ZCASHD_UID\
30-
$ZCASHD_USER
31-
USER $ZCASHD_USER
32-
WORKDIR /srv/$ZCASHD_USER
33-
RUN mkdir -p /srv/$ZCASHD_USER/.zcash/ \
34-
&& touch /srv/$ZCASHD_USER/.zcash/zcash.conf
29+
--uid "$ZCASHD_UID" \
30+
"$ZCASHD_USER"
31+
32+
RUN mkdir -p "/srv/$ZCASHD_USER/.zcash/" \
33+
&& touch "/srv/$ZCASHD_USER/.zcash/zcash.conf" \
34+
&& chown -R zcashd "/srv/$ZCASHD_USER"
35+
36+
WORKDIR "/srv/$ZCASHD_USER"
37+
ENV HOME="/srv/$ZCASHD_USER"
3538

3639
ADD entrypoint.sh /entrypoint.sh
3740
ENTRYPOINT ["/entrypoint.sh"]

0 commit comments

Comments
 (0)