Skip to content

Commit

Permalink
Use exact versions for proxy images
Browse files Browse the repository at this point in the history
  • Loading branch information
zodern committed Dec 9, 2020
1 parent ff4b85a commit e7830ad
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/plugins/meteor/assets/templates/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ BUNDLE_PATH=$APP_PATH/current
ENV_FILE=$APP_PATH/config/env.list
PORT=<%= port %>
BIND=<%= bind %>
NGINX_PROXY_VERSION=latest
LETS_ENCRYPT_VERSION=latest
NGINX_PROXY_VERSION="0.8.0"
LETS_ENCRYPT_VERSION="v1.13.1"
APP_IMAGE=<%- imagePrefix %><%= appName.toLowerCase() %>
IMAGE=$APP_IMAGE:latest
VOLUME="--volume=$BUNDLE_PATH:/bundle"
Expand Down
10 changes: 6 additions & 4 deletions src/plugins/proxy/assets/templates/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

APPNAME=<%= appName %>
APP_PATH=/opt/$APPNAME
NGINX_PROXY_VERSION="0.8.0"
LETSENCRYPT_COMPANION_VERSION="v1.13.1"

# Shared settings
source $APP_PATH/config/shared-config.sh
Expand All @@ -16,8 +18,8 @@ ENV_FILE_LETSENCRYPT=$APP_PATH/config/env_letsencrypt.list

# We don't need to fail the deployment because of a docker hub downtime
set +e
sudo docker pull jrcs/letsencrypt-nginx-proxy-companion:latest
sudo docker pull jwilder/nginx-proxy
sudo docker pull jrcs/letsencrypt-nginx-proxy-companion:$LETSENCRYPT_COMPANION_VERSION
sudo docker pull jwilder/nginx-proxy:$NGINX_PROXY_VERSION
set -e
echo "Pulled jwilder/nginx-proxy and jrcs/letsencrypt-nginx-proxy-companion"

Expand Down Expand Up @@ -58,7 +60,7 @@ sudo docker run \
-v /opt/$APPNAME/config/nginx-default.conf:/etc/nginx/conf.d/my_proxy.conf:ro \
-v /var/run/docker.sock:/tmp/docker.sock:ro \
-v /opt/$APPNAME/upstream:/etc/nginx/upstream \
jwilder/nginx-proxy
jwilder/nginx-proxy:$NGINX_PROXY_VERSION
echo "Ran nginx-proxy as $APPNAME"

sleep 2s
Expand All @@ -76,7 +78,7 @@ sudo docker run \
--log-opt max-size=100m \
--log-opt max-file=3 \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
jrcs/letsencrypt-nginx-proxy-companion
jrcs/letsencrypt-nginx-proxy-companion:$LETSENCRYPT_COMPANION_VERSION
echo "Ran jrcs/letsencrypt-nginx-proxy-companion"

<% if (swarmEnabled) { %>
Expand Down

0 comments on commit e7830ad

Please sign in to comment.