From 35706604ea83cdd53e9d662aa373aa3c613c0fb9 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Thu, 16 Jun 2022 15:22:59 -0700 Subject: [PATCH] Upgrade documentation base images. --- docs/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index 024032d6d..89cb1862d 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -1,14 +1,14 @@ -FROM python:3.8-alpine3.13 as borgmatic +FROM alpine:3.16.0 as borgmatic COPY . /app -RUN apk add --no-cache py3-ruamel.yaml py3-ruamel.yaml.clib +RUN apk add --no-cache py3-pip py3-ruamel.yaml py3-ruamel.yaml.clib RUN pip install --no-cache /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml RUN borgmatic --help > /command-line.txt \ && for action in init prune compact create check extract export-tar mount umount restore list info borg; do \ echo -e "\n--------------------------------------------------------------------------------\n" >> /command-line.txt \ && borgmatic "$action" --help >> /command-line.txt; done -FROM node:15.2.1-alpine as html +FROM node:18.4.0-alpine as html ARG ENVIRONMENT=production @@ -27,7 +27,7 @@ COPY . /source RUN NODE_ENV=${ENVIRONMENT} npx eleventy --input=/source/docs --output=/output/docs \ && mv /output/docs/index.html /output/index.html -FROM nginx:1.19.4-alpine +FROM nginx:1.22.0-alpine COPY --from=html /output /usr/share/nginx/html COPY --from=borgmatic /etc/borgmatic/config.yaml /usr/share/nginx/html/docs/reference/config.yaml