resolve merge conflict

This commit is contained in:
Dirk Wetter 2020-12-29 13:44:04 +01:00
parent 9ea7446203
commit 7c66535628

View File

@ -2,7 +2,8 @@ FROM alpine:3.11
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
apk add --no-cache bash procps drill git coreutils libidn curl socat openssl && \ apk add bash procps drill git coreutils libidn curl socat openssl && \
rm -rf /var/cache/apk/* && \
addgroup testssl && \ addgroup testssl && \
adduser -G testssl -g "testssl user" -s /bin/bash -D testssl && \ adduser -G testssl -g "testssl user" -s /bin/bash -D testssl && \
ln -s /home/testssl/testssl.sh /usr/local/bin/ && \ ln -s /home/testssl/testssl.sh /usr/local/bin/ && \