From fcd4fbd2ccf02eb09b99d434c5d61598ca569d69 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 12 Jun 2022 14:45:27 +0200 Subject: [PATCH 1/4] Use Redis7 (in place of Redis6) --- docker/node-redis.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/node-redis.Dockerfile b/docker/node-redis.Dockerfile index a4091ce7c..1c0faa0ef 100644 --- a/docker/node-redis.Dockerfile +++ b/docker/node-redis.Dockerfile @@ -1,6 +1,6 @@ -FROM redis:6 as redis +FROM redis:7 as redis -FROM node:16-buster +FROM node:16-bullseye-slim COPY --from=redis /usr/local/bin/redis-* /usr/local/bin/ RUN redis-cli --version From f74a142e2e717538c3b161dcd06d29390e14d525 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 12 Jun 2022 14:47:23 +0200 Subject: [PATCH 2/4] Use Node.js 18 (in place of 16) --- docker/node-redis.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/node-redis.Dockerfile b/docker/node-redis.Dockerfile index 1c0faa0ef..e1283ad63 100644 --- a/docker/node-redis.Dockerfile +++ b/docker/node-redis.Dockerfile @@ -1,6 +1,6 @@ FROM redis:7 as redis -FROM node:16-bullseye-slim +FROM node:18-bullseye-slim COPY --from=redis /usr/local/bin/redis-* /usr/local/bin/ RUN redis-cli --version From 8f994726f20f59e4735898d9ae6d106ebec7d638 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 12 Jun 2022 14:51:30 +0200 Subject: [PATCH 3/4] Use latest openzim/node-redis image --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 40db35617..64bdee59b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openzim/node-redis:14-6 +FROM openzim/node-redis:18-7 LABEL org.opencontainers.image.source https://github.com/openzim/mwoffliner # Install dependences From 6f2861d330825acf429ffab11bc5140ea313ffa5 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 12 Jun 2022 15:07:02 +0200 Subject: [PATCH 4/4] We need ssh which is not in the 'slim' image --- docker/node-redis.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/node-redis.Dockerfile b/docker/node-redis.Dockerfile index e1283ad63..fa795ac37 100644 --- a/docker/node-redis.Dockerfile +++ b/docker/node-redis.Dockerfile @@ -1,6 +1,6 @@ FROM redis:7 as redis -FROM node:18-bullseye-slim +FROM node:18-bullseye COPY --from=redis /usr/local/bin/redis-* /usr/local/bin/ RUN redis-cli --version