From 884b5685eba3a7e88c9b60378316fd346a4c3a42 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Thu, 11 Jan 2024 08:10:12 +0100 Subject: [PATCH] update docker images and github CI actions --- .github/workflows/ci-backend.yml | 6 ++-- .github/workflows/ci-build.yml | 6 ++-- .github/workflows/ci-frontend-api.yml | 24 +++++++-------- .github/workflows/ci-frontend.yml | 38 ++++++++++++------------ .github/workflows/ci-site.yml | 6 ++-- .github/workflows/e2e-tests.yml | 2 +- Dockerfile | 6 ++-- Dockerfile.artifacts | 4 +-- backend/_example/memory_store/Dockerfile | 4 +-- backend/_example/memory_store/go.mod | 4 ++- backend/_example/memory_store/go.sum | 3 ++ frontend/.nvmrc | 2 +- frontend/Dockerfile.e2e | 2 +- 13 files changed, 56 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml index e2511f76..ab4101b5 100644 --- a/.github/workflows/ci-backend.yml +++ b/.github/workflows/ci-backend.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: debug if needed run: if [[ "$DEBUG" == "true" ]]; then env; fi @@ -30,9 +30,9 @@ jobs: DEBUG: ${{secrets.DEBUG}} - name: install go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.21" - name: test and build backend run: | diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 86f890b9..ad62601c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -29,14 +29,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: available platforms run: echo ${{ steps.buildx.outputs.platforms }} diff --git a/.github/workflows/ci-frontend-api.yml b/.github/workflows/ci-frontend-api.yml index 9ca0102a..2aaf0676 100644 --- a/.github/workflows/ci-frontend-api.yml +++ b/.github/workflows/ci-frontend-api.yml @@ -20,19 +20,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 @@ -64,19 +64,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 @@ -108,19 +108,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 diff --git a/.github/workflows/ci-frontend.yml b/.github/workflows/ci-frontend.yml index 2087f782..e7b2a9d3 100644 --- a/.github/workflows/ci-frontend.yml +++ b/.github/workflows/ci-frontend.yml @@ -20,19 +20,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 @@ -64,19 +64,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 @@ -108,19 +108,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 @@ -155,17 +155,17 @@ jobs: CI_JOB_NUMBER: 1 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 run_install: false - name: Check bundle size - uses: andresz1/size-limit-action@dd31dce7dcc72a041fd3e49abf0502b13fc4ce05 + uses: andresz1/size-limit-action@7313b26c76b3666c1dc41e2ca05370e201a9b7de with: github_token: ${{ secrets.GITHUB_TOKEN }} directory: ./frontend/apps/remark42 @@ -176,19 +176,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [16.15.1] + node: [16.20.2] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2.4.0 id: pnpm-install with: version: 7 diff --git a/.github/workflows/ci-site.yml b/.github/workflows/ci-site.yml index 0e616594..70aa0408 100644 --- a/.github/workflows/ci-site.yml +++ b/.github/workflows/ci-site.yml @@ -20,14 +20,14 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: available platforms run: echo ${{ steps.buildx.outputs.platforms }} diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index a58530e9..c282550c 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build & run containers id: tests diff --git a/Dockerfile b/Dockerfile index 014179f7..feded499 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM node:16.15.1-alpine AS frontend-deps +FROM --platform=$BUILDPLATFORM node:16.20.2-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.11.0 as build-backend +FROM umputun/baseimage:buildgo-v1.12.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.11.0 +FROM umputun/baseimage:app-v1.12.0 ARG GITHUB_SHA diff --git a/Dockerfile.artifacts b/Dockerfile.artifacts index 17468eb6..2697764c 100644 --- a/Dockerfile.artifacts +++ b/Dockerfile.artifacts @@ -1,4 +1,4 @@ -FROM node:16.15.1-alpine AS frontend-deps +FROM node:16.20.2-alpine AS frontend-deps ENV CI=true @@ -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.9.2 as build-backend +FROM umputun/baseimage:buildgo-v1.12.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 c74898d7..08e63ca7 100644 --- a/backend/_example/memory_store/Dockerfile +++ b/backend/_example/memory_store/Dockerfile @@ -1,11 +1,11 @@ -FROM umputun/baseimage:buildgo-v1.9.2 as build-backend +FROM umputun/baseimage:buildgo-v1.12.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.9.2 +FROM umputun/baseimage:app-v1.12.0 ARG GITHUB_SHA diff --git a/backend/_example/memory_store/go.mod b/backend/_example/memory_store/go.mod index 930da80c..40ecd2dd 100644 --- a/backend/_example/memory_store/go.mod +++ b/backend/_example/memory_store/go.mod @@ -1,6 +1,8 @@ module github.com/umputun/remark42/memory_store -go 1.20 +go 1.21 + +toolchain go1.21.6 require ( github.com/go-pkgz/jrpc v0.3.0 diff --git a/backend/_example/memory_store/go.sum b/backend/_example/memory_store/go.sum index f4afd394..709c99a9 100644 --- a/backend/_example/memory_store/go.sum +++ b/backend/_example/memory_store/go.sum @@ -5,9 +5,11 @@ github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJs github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink= +github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/chroma/v2 v2.8.0 h1:w9WJUjFFmHHB2e8mRpL9jjy3alYDlU0QLDezj1xE264= github.com/alecthomas/chroma/v2 v2.8.0/go.mod h1:yrkMI9807G1ROx13fhe1v6PN2DDeaR73L3d+1nmYQtw= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU= @@ -47,6 +49,7 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= diff --git a/frontend/.nvmrc b/frontend/.nvmrc index d9289897..cb406c60 100644 --- a/frontend/.nvmrc +++ b/frontend/.nvmrc @@ -1 +1 @@ -16.15.1 +16.20.2 diff --git a/frontend/Dockerfile.e2e b/frontend/Dockerfile.e2e index 5582336f..6c634845 100644 --- a/frontend/Dockerfile.e2e +++ b/frontend/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright:v1.25.0-focal +FROM mcr.microsoft.com/playwright:v1.40.1-jammy ENV CI true WORKDIR /frontend