From 83e3782dd50cf82cf7167d48091750565f51980c Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Tue, 4 Jun 2024 23:43:14 +0200 Subject: [PATCH] update docker images, clarify comments --- Dockerfile | 8 ++++---- Dockerfile.artifacts | 2 +- backend/_example/memory_store/Dockerfile | 6 +++--- frontend/Dockerfile.e2e | 2 +- site/Dockerfile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index feded499f1..941e7c01bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM node:16.20.2-alpine AS frontend-deps +FROM --platform=$BUILDPLATFORM node:16.20-alpine AS frontend-deps ARG SKIP_FRONTEND_TEST ARG SKIP_FRONTEND_BUILD @@ -45,7 +45,7 @@ RUN \ echo 'Skip frontend build'; \ fi -FROM umputun/baseimage:buildgo-v1.12.0 as build-backend +FROM umputun/baseimage:buildgo-v1.13.0 as build-backend ARG CI ARG GITHUB_REF @@ -81,7 +81,7 @@ RUN \ echo "version=$version" && \ go build -o remark42 -ldflags "-X main.revision=${version} -s -w" ./app -FROM umputun/baseimage:app-v1.12.0 +FROM umputun/baseimage:app-v1.13.0 ARG GITHUB_SHA @@ -89,7 +89,7 @@ LABEL org.opencontainers.image.authors="Umputun " \ org.opencontainers.image.description="Remark42 comment engine" \ org.opencontainers.image.documentation="https://remark42.com/docs/getting-started/" \ org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/umputun/remark42.git" \ + org.opencontainers.image.source="https://github.com/umputun/remark42" \ org.opencontainers.image.title="Remark42" \ org.opencontainers.image.url="https://remark42.com/" \ org.opencontainers.image.revision="${GITHUB_SHA}" diff --git a/Dockerfile.artifacts b/Dockerfile.artifacts index 2697764cff..35737da99f 100644 --- a/Dockerfile.artifacts +++ b/Dockerfile.artifacts @@ -19,7 +19,7 @@ WORKDIR /srv/frontend/apps/remark42/ COPY ./frontend/apps/remark42/ /srv/frontend/apps/remark42/ RUN pnpm build -FROM umputun/baseimage:buildgo-v1.12.0 as build-backend +FROM umputun/baseimage:buildgo-v1.13.0 as build-backend ARG GITHUB_TOKEN ARG GITHUB_REF diff --git a/backend/_example/memory_store/Dockerfile b/backend/_example/memory_store/Dockerfile index 08e63ca793..d9abf6fa09 100644 --- a/backend/_example/memory_store/Dockerfile +++ b/backend/_example/memory_store/Dockerfile @@ -1,11 +1,11 @@ -FROM umputun/baseimage:buildgo-v1.12.0 as build-backend +FROM umputun/baseimage:buildgo-v1.13.0 as build-backend ADD backend /build/backend WORKDIR /build/backend/_example/memory_store RUN go build -o /build/bin/memory_store -ldflags "-X main.revision=0.0.0 -s -w" -FROM umputun/baseimage:app-v1.12.0 +FROM umputun/baseimage:app-v1.13.0 ARG GITHUB_SHA @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.authors="Umputun " \ org.opencontainers.image.description="Remark42 comment engine example JRPC memory store" \ org.opencontainers.image.documentation="https://github.com/umputun/remark42/tree/master/backend/_example/memory_store" \ org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/umputun/remark42.git" \ + org.opencontainers.image.source="https://github.com/umputun/remark42" \ org.opencontainers.image.title="Remark42 JRPC example memory store" \ org.opencontainers.image.url="https://remark42.com/" \ org.opencontainers.image.revision="${GITHUB_SHA}" diff --git a/frontend/Dockerfile.e2e b/frontend/Dockerfile.e2e index d93a356156..7a0f075a3b 100644 --- a/frontend/Dockerfile.e2e +++ b/frontend/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright:v1.40.1-jammy +FROM mcr.microsoft.com/playwright:v1.44-jammy ENV CI true WORKDIR /frontend diff --git a/site/Dockerfile b/site/Dockerfile index f9948dc3d4..9dd161ea4e 100644 --- a/site/Dockerfile +++ b/site/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors="Umputun " \ org.opencontainers.image.description="Remark42 site" \ org.opencontainers.image.documentation="https://github.com/umputun/remark42/tree/master/site" \ org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/umputun/remark42.git" \ + org.opencontainers.image.source="https://github.com/umputun/remark42" \ org.opencontainers.image.title="Remark42 site" \ org.opencontainers.image.url="https://remark42.com/"