Skip to content

Commit

Permalink
Merge pull request #1181 from Amsterdam/redis/switch-off
Browse files Browse the repository at this point in the history
Commented Redis build
  • Loading branch information
remyvdwereld authored Dec 4, 2023
2 parents 6b46767 + 567c707 commit 130f64e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 34 deletions.
7 changes: 4 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
}

Expand All @@ -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)
}
}
}
Expand All @@ -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)
}
}
}
1 change: 1 addition & 0 deletions redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
31 changes: 0 additions & 31 deletions redis/adp_rootca.crt

This file was deleted.

0 comments on commit 130f64e

Please sign in to comment.