From b5ee8a303ca709870ed7c620481a06cea7e2e9f0 Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:59:40 +0100 Subject: [PATCH 1/4] Test path --- Jenkinsfile | 2 +- redis/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 60becfbe3..ff71a58c3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,7 +92,7 @@ pipeline { stage("Push and deploy acceptance images") { when { not { buildingTag() } - branch 'master' + // branch 'master' } steps { tag_and_deploy(env.ZAKEN_IMAGE_URL, env.ZAKEN_NAME, env.ACCEPTANCE) diff --git a/redis/Dockerfile b/redis/Dockerfile index 80a014876..5ad85ecda 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -3,7 +3,7 @@ FROM redis:6.2.14-alpine3.18 ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt # Setup Certificates for ADP/Motiv -COPY app/certificates/adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt +COPY /app/certificates/adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt RUN chmod 644 /usr/local/share/ca-certificates/adp_rootca.crt \ && update-ca-certificates --fresh From 37e8a7d8b5f7a8af0b554b5785473f12b2843712 Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:08:12 +0100 Subject: [PATCH 2/4] Added certificate --- redis/Dockerfile | 2 +- redis/adp_rootca.crt | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 redis/adp_rootca.crt diff --git a/redis/Dockerfile b/redis/Dockerfile index 5ad85ecda..ea4d1cdae 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -3,7 +3,7 @@ FROM redis:6.2.14-alpine3.18 ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt # Setup Certificates for ADP/Motiv -COPY /app/certificates/adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt +COPY adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt RUN chmod 644 /usr/local/share/ca-certificates/adp_rootca.crt \ && update-ca-certificates --fresh diff --git a/redis/adp_rootca.crt b/redis/adp_rootca.crt new file mode 100644 index 000000000..90269c2db --- /dev/null +++ b/redis/adp_rootca.crt @@ -0,0 +1,31 @@ +-----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----- From fb2fd70093824e90c3a93733fae158f61cec526f Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:14:45 +0100 Subject: [PATCH 3/4] Test --- redis/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redis/Dockerfile b/redis/Dockerfile index ea4d1cdae..f44056692 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -1,11 +1,11 @@ FROM redis:6.2.14-alpine3.18 -ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt - # Setup Certificates for ADP/Motiv COPY adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt -RUN chmod 644 /usr/local/share/ca-certificates/adp_rootca.crt \ - && update-ca-certificates --fresh +RUN cat /usr/local/share/ca-certificates/adp_rootca.crt >> /etc/ssl/cert.pem +RUN apk update && \ + apk add --no-cache ca-certificates && \ + update-ca-certificates --fresh RUN apk add --no-cache gettext COPY redis.conf.template /usr/local/etc/redis/redis.conf.template From 7e80ce88a1228164c2a6776151b09ba9d7c957db Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Fri, 1 Dec 2023 16:47:48 +0100 Subject: [PATCH 4/4] Changed jenkins --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff71a58c3..d64a838c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,13 +92,13 @@ pipeline { stage("Push and deploy acceptance images") { when { not { buildingTag() } - // branch 'master' + branch 'master' } steps { tag_and_deploy(env.ZAKEN_IMAGE_URL, env.ZAKEN_NAME, env.ACCEPTANCE) tag_and_deploy(env.OPEN_ZAAK_IMAGE_URL, env.OPEN_ZAAK_NAME, env.ACCEPTANCE) tag_and_deploy(env.OPEN_NOTIFICATIES_IMAGE_URL, env.OPEN_NOTIFICATIES_NAME, env.ACCEPTANCE) - tag_and_deploy(env.REDIS_IMAGE_URL, env.REDIS_NAME, env.ACCEPTANCE) + // tag_and_deploy(env.REDIS_IMAGE_URL, env.REDIS_NAME, env.ACCEPTANCE) } } @@ -109,6 +109,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) } } } @@ -118,6 +119,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) } } }