From 77af2eecd0645da7c1b296bbe10aebe89d8606be Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 6 Sep 2020 22:50:17 -0400
Subject: [PATCH] fix certbot renew not updating prod certs

---
 .idea/codeStyles/codeStyleConfig.xml            | 5 +++++
 dockerfiles/services/sslproxy/cli/certbot/info  | 2 +-
 dockerfiles/services/sslproxy/cli/certbot/renew | 3 ++-
 dockerfiles/services/sslproxy/renew.Jenkinsfile | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..2d5ecf2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="PSR2" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/dockerfiles/services/sslproxy/cli/certbot/info b/dockerfiles/services/sslproxy/cli/certbot/info
index 79bb8ec..3cbae63 100755
--- a/dockerfiles/services/sslproxy/cli/certbot/info
+++ b/dockerfiles/services/sslproxy/cli/certbot/info
@@ -19,4 +19,4 @@ export DOCKER_HOST=${DOCKER_HOST:-'dkhost:2376'}
 # shellcheck disable=SC2068
 docker-compose \
   -f docker-compose.tools.yml \
-  run certificates
+  run --rm certificates
diff --git a/dockerfiles/services/sslproxy/cli/certbot/renew b/dockerfiles/services/sslproxy/cli/certbot/renew
index f7a2ca0..7df6fd0 100755
--- a/dockerfiles/services/sslproxy/cli/certbot/renew
+++ b/dockerfiles/services/sslproxy/cli/certbot/renew
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 set -e
 
 LETSENCRYPT_IMAGE=dkregistry.xai-corp.net:5000/xaicorp/acme-certbot
@@ -23,6 +22,8 @@ update() {
   export LETSENCRYPT_IMAGE
   export CERT_NAME
 
+  echo "Updating ${ENVIRONMENT}"
+
   # shellcheck disable=SC2086
   docker-compose \
     -f docker-compose.tools.yml \
diff --git a/dockerfiles/services/sslproxy/renew.Jenkinsfile b/dockerfiles/services/sslproxy/renew.Jenkinsfile
index edcc0c5..7b727c1 100644
--- a/dockerfiles/services/sslproxy/renew.Jenkinsfile
+++ b/dockerfiles/services/sslproxy/renew.Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
                 dir(WORKDIR) {
                     withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
                         sh "pwd"
-                        sh "xai certbot renew"
+                        sh "xai certbot renew -p"
                     }
                 }
             }