Merge pull request #1 from dcos-labs/mattj/certbot_0.31_update

Update Certbot to 0.31.0
dcos-labs · Feb 28, 2019 · ac95ccc · ac95ccc
2 parents e0bb973 + c6820ec
commit ac95ccc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:jessie
 
 WORKDIR /
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CERTBOT_VERSION=0.26.1
+ENV CERTBOT_VERSION=0.31.0
 RUN apt-get update \
   && apt-get install -y unzip curl python-pip \
   && pip install --upgrade pip \

diff --git a/letsencrypt-dcos.json b/letsencrypt-dcos.json
@@ -20,7 +20,7 @@
       }
     ],
     "docker": {
-      "image": "mesosphere/letsencrypt-dcos:v1.0.4",
+      "image": "dcoslabs/letsencrypt-dcos:v1.0.5",
       "network": "BRIDGE",
       "portMappings": [
         {
@@ -34,10 +34,10 @@
   "env": {
     "MARATHON_LB_ID": "marathon-lb",
     "MARATHON_URL": "http://marathon.mesos:8080",
-    "LETSENCRYPT_EMAIL": "brenden@mesosphere.com"
+    "LETSENCRYPT_EMAIL": "matt@example.com"
   },
   "labels": {
-    "HAPROXY_0_VHOST": "ssl-test-1.mesosphere.com,ssl-test-2.mesosphere.com",
+    "HAPROXY_0_VHOST": "ssl-test-1.example.com,ssl-test-2.example.com",
     "HAPROXY_GROUP": "external",
     "HAPROXY_0_PATH": "/.well-known/acme-challenge"
   },

diff --git a/test/letsencrypt-dcos-test-1.json b/test/letsencrypt-dcos-test-1.json
@@ -6,7 +6,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "mesosphere/letsencrypt-dcos-test",
+      "image": "dcoslabs/letsencrypt-dcos-test",
       "network": "BRIDGE",
       "portMappings": [{
               "containerPort": 8080,
@@ -26,7 +26,7 @@
   }],
   "labels":{
     "HAPROXY_GROUP":"external",
-    "HAPROXY_0_VHOST":"ssl-test-1.mesosphere.com",
+    "HAPROXY_0_VHOST":"ssl-test-1.example.com",
     "HAPROXY_0_REDIRECT_TO_HTTPS":"true",
     "HAPROXY_0_USE_HSTS":"true"
   }

diff --git a/test/letsencrypt-dcos-test-2.json b/test/letsencrypt-dcos-test-2.json
@@ -6,7 +6,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "mesosphere/letsencrypt-dcos-test",
+      "image": "dcoslabs/letsencrypt-dcos-test",
       "network": "BRIDGE",
       "portMappings": [{
               "containerPort": 8080,
@@ -26,6 +26,6 @@
   }],
   "labels":{
     "HAPROXY_GROUP":"external",
-    "HAPROXY_0_VHOST":"ssl-test-2.mesosphere.com"
+    "HAPROXY_0_VHOST":"ssl-test-2.example.com"
   }
 }