From 567c70743a649b62aabea3ef9667677d1fbef54f Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:48:37 +0100 Subject: [PATCH] Commented Redis build --- Jenkinsfile | 7 ++++--- redis/Dockerfile | 1 + redis/adp_rootca.crt | 31 ------------------------------- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 redis/adp_rootca.crt diff --git a/Jenkinsfile b/Jenkinsfile index d64a838c9..df69ddc35 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,6 +57,7 @@ pipeline { ZAKEN_SOURCE = "./app" ZAKEN_NAME = "zaken" + // There is no need to deploy Redis every time. REDIS_IMAGE_URL = "${DOCKER_REGISTRY_NO_PROTOCOL}/fixxx/zaken-redis" REDIS_SOURCE = "./redis" REDIS_NAME = "zaken-redis" @@ -85,7 +86,7 @@ pipeline { build_image(env.ZAKEN_IMAGE_URL, env.ZAKEN_SOURCE) build_image(env.OPEN_ZAAK_IMAGE_URL, env.OPEN_ZAAK_SOURCE) build_image(env.OPEN_NOTIFICATIES_IMAGE_URL, env.OPEN_NOTIFICATIES_SOURCE) - build_image(env.REDIS_IMAGE_URL, env.REDIS_SOURCE) + // build_image(env.REDIS_IMAGE_URL, env.REDIS_SOURCE) } } @@ -109,7 +110,7 @@ pipeline { tag_and_deploy(env.ZAKEN_IMAGE_URL, env.ZAKEN_NAME, env.PRODUCTION) // tag_and_deploy(env.OPEN_ZAAK_IMAGE_URL, env.OPEN_ZAAK_NAME, env.PRODUCTION) // tag_and_deploy(env.OPEN_NOTIFICATIES_IMAGE_URL, env.OPEN_NOTIFICATIES_NAME, env.PRODUCTION) - tag_and_deploy(env.REDIS_IMAGE_URL, env.REDIS_NAME, env.PRODUCTION) + // tag_and_deploy(env.REDIS_IMAGE_URL, env.REDIS_NAME, env.PRODUCTION) } } } @@ -119,7 +120,7 @@ pipeline { remove_image(env.ZAKEN_IMAGE_URL) remove_image(env.OPEN_ZAAK_IMAGE_URL) remove_image(env.OPEN_NOTIFICATIES_IMAGE_URL) - remove_image(env.REDIS_IMAGE_URL) + // remove_image(env.REDIS_IMAGE_URL) } } } diff --git a/redis/Dockerfile b/redis/Dockerfile index f44056692..70758fe6b 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -1,6 +1,7 @@ FROM redis:6.2.14-alpine3.18 # Setup Certificates for ADP/Motiv +# Add the certificate to the Redis folder before deployment. COPY adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt RUN cat /usr/local/share/ca-certificates/adp_rootca.crt >> /etc/ssl/cert.pem RUN apk update && \ diff --git a/redis/adp_rootca.crt b/redis/adp_rootca.crt deleted file mode 100644 index 90269c2db..000000000 --- a/redis/adp_rootca.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFVDCCAzygAwIBAgIQPVjMoVC1Dq5AEwir99iRkTANBgkqhkiG9w0BAQsFADAc -MRowGAYDVQQDExFBbXN0ZXJkYW0tUm9vdC1DQTAeFw0xNDA2MDYwOTQwNDZaFw0z -NDA2MDYwOTUwMzhaMBwxGjAYBgNVBAMTEUFtc3RlcmRhbS1Sb290LUNBMIICIjAN -BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAv1IXzzaZZab1iDDLYDGTOYcxoSZE -S0GS2nI0PYEAvcKPojqIdr3VzhgSYFlOaX3t+E+w8DjF0clzVdH730vf/ofAi3NZ -WC1XjupAyaTbnbr05ww9+pE7+LzVEbGTYJue4K6TwH1jUNo1qSA7DC5370s5/kr2 -h8dpzZwqMMpUssvMS4laqtHokZpuaWZ7akWRXApRqSy2aWExJ+lfCrKbZVl+RMkz -Y36fvJj/gRSLZrCYD9fV7hngKoDfDnUJG7NO31CopF/+9RgjMT8S9DwfL3MKy1Uw -szEOtnwiuYKBrKY59guTfgRXIy/DRfDR8+1XwrcuXQNdRUgztdX6OQhbv396GScm -9EDnDVWCtV+oSH4LAIjhxCeRDjCxRhxuO4P/TpUwjW6vpx7j7tFOSf9YJcwPcMqi -eoHdde7JkQTTXzzVe1tP8ybCaqI+THsUD4t39HLp90WwWqwkd6m0lRns03e6qOl8 -EthbLkhsSQHAQGvHVzBttEPxpfVy+zQtXIrUX7svfLzS2BYmsJzTvmWHfijItbG5 -BfWnwj/Gpf2erdRQLuTOZkRajtyade58tcaN0RuKGEb95tLeqOx9ttV+w4AfNTiR -oCChtN1sQKPYnfwwCCdqhDgyU0+0dB5iby0vymmKnNN88TOeZR03cRBhqn+iqdLk -5fzUdxGFjLMCIo0CAwEAAaOBkTCBjjALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw -AwEB/zAdBgNVHQ4EFgQUEBqbZq4Qbh76HzImS1fLgRY/vCQwEAYJKwYBBAGCNxUB -BAMCAQAwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9w -a2kuYW1zdGVyZGFtLm5sL2NzcAAwDQYJKoZIhvcNAQELBQADggIBAEiWc6z4Rkq2 -jZMbmCaC264F5Bt9u4tvOSV8PO3EVSkwNeqMZQ64Ga/C9BqpRWEpBXBlhaAGJgDd -65mnYLsi0AYEQ7BXKFkXHp+MpMiWGnknp/RstOpJuHE3yj7QjKeSqeXbCw4hOoVK -wT0gbGNDvviDd40MYcGii0y7MeO3dd/dSfdA0yOFsY/y3DOX3Q/JYG3hIQ1IbTFk -7ySMVX0U3XF2ZQjXk1cSiqA5/UgBNLe4+i0pBJyEOhnnJfCH3s83riSMdLM4D/Us -DSE1XflFGUCMhrr06wV9tXuroiK1nJhY2Z//w7RcNJIEMjzekfZH9ZC06nBPjxCa -G7TxY7eZfQ/l/UofjiuMr3RHYg7XvkQRjYdAYCZQWzcJs1QO/OTY5lz1Q1aR5NB5 -EP/jahYlQcywH+ISqTh6RfOKWFvTtTSAXrp8VRPiolBbvZBAQb6xXLKjav8oFLqp -r/eAYLIXPFRladiewBoJMIhBrMW51xCMSz0HsepbKWIaoEgxRb0ya2NxwozbDA8F -lxMb/sZXG7K1uN40jDeUp+fE236381Fw9RfTKdkvtXbjpEJ8byuCILRscEjLs+RX -sqIU/Wz1etLxrZdrKNlgbGB6U7ZP6gNu3N8XH4kp/y9EUn3v5CJbOIFrOSNd6FeO -sEOmbBwAzVc6Q5CUM/iAum3SC/K/vZnz ------END CERTIFICATE-----