Skip to content

Commit 4ee8fc6

Browse files
committed
Updating docker to have less layers and removing extraneous logging
1 parent 8aafd06 commit 4ee8fc6

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

installers/docker/Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
FROM alpine:latest
22

3-
RUN apk --no-cache add wget
4-
5-
RUN wget -qO- https://www.gershnik.com/alpine-repo/gershnik@hotmail.com-6643812b.rsa.pub \
3+
RUN <<EOF
4+
set -ex
5+
apk --no-cache add wget
6+
wget -qO- https://www.gershnik.com/alpine-repo/gershnik@hotmail.com-6643812b.rsa.pub \
67
> /etc/apk/keys/gershnik@hotmail.com-6643812b.rsa.pub
7-
8-
RUN mkdir -p /etc/apk/repositories.d && \
9-
echo "https://www.gershnik.com/alpine-repo/main" \
8+
mkdir -p /etc/apk/repositories.d
9+
echo "https://www.gershnik.com/alpine-repo/main" \
1010
> /etc/apk/repositories.d/www.gershnik.com.list
11+
apk del wget
12+
apk update
13+
apk --no-cache add wsdd-native
1114

12-
RUN apk del wget
13-
14-
RUN apk update
15-
16-
RUN apk --no-cache add wsdd-native
15+
EOF
1716

1817
COPY run-wsddn ./
1918

installers/docker/run-wsddn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ if [ ! -z "${WSDDN_WORKGROUP}" ]; then
1212
elif [ ! -z "${WSDDN_DOMAIN}" ]; then
1313
exec wsddn --user wsddn --hostname "${WSDDN_HOSTNAME}" --domain "${WSDDN_DOMAIN}"
1414
else
15-
exec wsddn --user wsddn --hostname "${WSDDN_HOSTNAME}" --log-level=5
15+
exec wsddn --user wsddn --hostname "${WSDDN_HOSTNAME}"
1616
fi

0 commit comments

Comments
 (0)