feature(helpers): allow specifying tag
This commit is contained in:
parent
a3c6656764
commit
bc2a34ddd8
@ -2,11 +2,18 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CommitMessageInspectionProfile">
|
<component name="CommitMessageInspectionProfile">
|
||||||
<profile version="1.0">
|
<profile version="1.0">
|
||||||
<inspection_tool class="BodyLimit" enabled="true" level="ERROR" enabled_by_default="true" />
|
<inspection_tool class="BodyLimit" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||||
<inspection_tool class="SubjectBodySeparation" enabled="true" level="ERROR" enabled_by_default="true" />
|
<inspection_tool class="SubjectBodySeparation" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||||
<inspection_tool class="SubjectLimit" enabled="true" level="ERROR" enabled_by_default="true" />
|
<inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</component>
|
</component>
|
||||||
|
<component name="GitSharedSettings">
|
||||||
|
<option name="FORCE_PUSH_PROHIBITED_PATTERNS">
|
||||||
|
<list>
|
||||||
|
<option value="master main" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
|
@ -6,6 +6,22 @@
|
|||||||
###
|
###
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Container options
|
||||||
|
#
|
||||||
|
|
||||||
|
# Specify a particular tag to 'version pin' the ab-nginx container.
|
||||||
|
#TAG=latest
|
||||||
|
|
||||||
|
# Specify a runtime UID and GID for the container user. This is useful to
|
||||||
|
# ensure the container can read and/or write to locations on the host or
|
||||||
|
# has access to files shared between members of a container stack.
|
||||||
|
# REQUIRED: NO
|
||||||
|
# DEFAULT: UID=8080, GID=8080
|
||||||
|
# VALID OPTIONS: any permissible and available UID/GID value
|
||||||
|
#UID=8080
|
||||||
|
#GID=8080
|
||||||
|
|
||||||
#
|
#
|
||||||
# Network options
|
# Network options
|
||||||
#
|
#
|
||||||
|
@ -231,7 +231,7 @@ if [ -z "$SSL_CERT" ]; then
|
|||||||
--network=${NETWORK} \
|
--network=${NETWORK} \
|
||||||
-p ${HTTP_PORT}:80 \
|
-p ${HTTP_PORT}:80 \
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
docker.asifbacchus.dev/nginx/ab-nginx:latest
|
docker.asifbacchus.dev/nginx/ab-nginx:${TAG:-latest}
|
||||||
fi
|
fi
|
||||||
# run with TLS
|
# run with TLS
|
||||||
else
|
else
|
||||||
@ -251,7 +251,7 @@ else
|
|||||||
-v "$SSL_KEY":/certs/privkey.pem:ro \
|
-v "$SSL_KEY":/certs/privkey.pem:ro \
|
||||||
-v "$SSL_CHAIN":/certs/chain.pem:ro \
|
-v "$SSL_CHAIN":/certs/chain.pem:ro \
|
||||||
-p ${HTTP_PORT}:80 -p ${HTTPS_PORT}:443 \
|
-p ${HTTP_PORT}:80 -p ${HTTPS_PORT}:443 \
|
||||||
docker.asifbacchus.dev/nginx/ab-nginx:latest /bin/sh
|
docker.asifbacchus.dev/nginx/ab-nginx:${TAG:-latest} /bin/sh
|
||||||
else
|
else
|
||||||
if [ "$TLS13_ONLY" = 'FALSE' ]; then
|
if [ "$TLS13_ONLY" = 'FALSE' ]; then
|
||||||
printf "%s\nRunning NGINX on %s (TLS 1.2)...%s\n" "$cyan" "$container_name" "$norm"
|
printf "%s\nRunning NGINX on %s (TLS 1.2)...%s\n" "$cyan" "$container_name" "$norm"
|
||||||
@ -269,7 +269,7 @@ else
|
|||||||
-v "$SSL_CHAIN":/certs/chain.pem:ro \
|
-v "$SSL_CHAIN":/certs/chain.pem:ro \
|
||||||
-p ${HTTP_PORT}:80 -p ${HTTPS_PORT}:443 \
|
-p ${HTTP_PORT}:80 -p ${HTTPS_PORT}:443 \
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
docker.asifbacchus.dev/nginx/ab-nginx:latest
|
docker.asifbacchus.dev/nginx/ab-nginx:${TAG:-latest}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user