File tree Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ FROM rpardini/nginx-proxy-connect-stable-alpine:nginx-1.16.1-alpine-3.11
4
4
5
5
# Add openssl, bash and ca-certificates, then clean apk cache -- yeah complain all you want.
6
6
# Also added deps for mitmproxy.
7
- RUN apk add --update openssl bash ca-certificates su-exec git g++ libffi libffi-dev libstdc++ openssl openssl-dev python3 python3-dev \
7
+ RUN apk add --update openssl bash ca-certificates su-exec coreutils git g++ libffi libffi-dev libstdc++ openssl openssl-dev python3 python3-dev \
8
8
&& LDFLAGS=-L/lib pip3 install mitmproxy \
9
9
&& apk del --purge git g++ libffi-dev openssl-dev python3-dev \
10
10
&& rm -rf /var/cache/apk/* \
Original file line number Diff line number Diff line change @@ -57,8 +57,7 @@ if [ "$AUTH_REGISTRIES" ]; then
57
57
AUTH_HOST=" ${registry_array[0]} "
58
58
AUTH_USER=" ${registry_array[1]} "
59
59
AUTH_PASS=" ${registry_array[2]} "
60
- # make base64 not wrap lines: https://superuser.com/a/1225334
61
- AUTH_BASE64=$( echo -n " ${AUTH_USER} :${AUTH_PASS} " | base64 | tr -d \\ n )
60
+ AUTH_BASE64=$( echo -n ${AUTH_USER} :${AUTH_PASS} | base64 -w0 | xargs)
62
61
echo " Adding Auth for registry '${AUTH_HOST} ' with user '${AUTH_USER} '."
63
62
echo " \" ${AUTH_HOST} \" \" ${AUTH_BASE64} \" ;" >> /etc/nginx/docker.auth.map
64
63
done
You can’t perform that action at this time.
0 commit comments