Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement/update redis alpine #1180

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Improvement/update redis alpine #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ee8a3
Test path
remyvdwereld Nov 30, 2023
37e8a7d
Added certificate
remyvdwereld Nov 30, 2023
fb2fd70
Test
remyvdwereld Dec 1, 2023
7e80ce8
Changed jenkins
remyvdwereld Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pipeline {
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)
}
}

Expand All @@ -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)
}
}
}
Expand All @@ -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)
}
}
}
10 changes: 5 additions & 5 deletions redis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 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
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 && \
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
Expand Down
31 changes: 31 additions & 0 deletions redis/adp_rootca.crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-----
Loading