mirror of
https://github.com/thib8956/nginx-proxy
synced 2024-11-22 03:46:29 +00:00
Fixed Alpine image, removed dhparams gen from test units
This commit is contained in:
parent
6242403d33
commit
7c0f7b9449
@ -3,12 +3,11 @@ MAINTAINER Jason Wilder mail@jasonwilder.com
|
|||||||
|
|
||||||
# Install wget and install/updates certificates
|
# Install wget and install/updates certificates
|
||||||
RUN apk add --no-cache --virtual .run-deps \
|
RUN apk add --no-cache --virtual .run-deps \
|
||||||
ca-certificates bash wget \
|
ca-certificates bash wget openssl \
|
||||||
&& update-ca-certificates
|
&& update-ca-certificates
|
||||||
|
|
||||||
# Configure Nginx and apply fix for very long server names
|
# Configure Nginx and apply fix for very long server names
|
||||||
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
|
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
|
||||||
&& sed -i 's/^http {/&\n server_names_hash_bucket_size 128;/g' /etc/nginx/nginx.conf
|
|
||||||
|
|
||||||
# Install Forego
|
# Install Forego
|
||||||
ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego
|
ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego
|
||||||
|
@ -39,4 +39,4 @@ touch $GEN_LOCKFILE
|
|||||||
&& nginx -s reload
|
&& nginx -s reload
|
||||||
) | grep -vE '^[\.+]+'
|
) | grep -vE '^[\.+]+'
|
||||||
rm $GEN_LOCKFILE
|
rm $GEN_LOCKFILE
|
||||||
) &
|
) &disown
|
||||||
|
8
test/lib/ssl/dhparam.pem
Normal file
8
test/lib/ssl/dhparam.pem
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
-----BEGIN DH PARAMETERS-----
|
||||||
|
MIIBCAKCAQEA1cae6HqPSgicEuAuSCf6Ii3d6qMX9Ta8lnwoX0JQ0CWK7mzaiiIi
|
||||||
|
dY7oHmc4cq0S3SH+g0tdLP9yqygFS9hdUGINwS2VV6poj2/vdL/dUshegyxpEH58
|
||||||
|
nofCPnFDeKkcPDMYAlGS8zjp60TsBkRJKcrxxwnjod1Q5mWuMN5KH3sxs842udKH
|
||||||
|
0nHFE9kKW/NfXb+EGsjpocGpf786cGuCO2d00THsoItOEcM9/aI8DX1QcyxAHR6D
|
||||||
|
HaYTFJnyyx8Q44u27M15idI4pbNoKORlotiuOwCTGYCfbN14aOV+Ict7aSF8FWpP
|
||||||
|
48j9SMNuIu2DlF9pNLo6fsrOjYY3c9X12wIBAg==
|
||||||
|
-----END DH PARAMETERS-----
|
@ -35,6 +35,7 @@ function nginxproxy {
|
|||||||
&& docker run -d \
|
&& docker run -d \
|
||||||
--label bats-type="nginx-proxy" \
|
--label bats-type="nginx-proxy" \
|
||||||
--name $container_name \
|
--name $container_name \
|
||||||
|
-v $DIR/lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro \
|
||||||
"$@" \
|
"$@" \
|
||||||
$SUT_IMAGE \
|
$SUT_IMAGE \
|
||||||
&& wait_for_nginxproxy_container_to_start $container_name \
|
&& wait_for_nginxproxy_container_to_start $container_name \
|
||||||
|
Loading…
Reference in New Issue
Block a user