From add7d384c64c12936af9fa1d24619d1ac9108e1d Mon Sep 17 00:00:00 2001 From: Karl Merkli Date: Wed, 7 Dec 2022 13:56:53 +0100 Subject: [PATCH 1/3] chore: upgrade node to v16 --- .github/workflows/image-release.yml | 4 ++-- dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml index 38bff46..eaa3561 100644 --- a/.github/workflows/image-release.yml +++ b/.github/workflows/image-release.yml @@ -3,7 +3,7 @@ name: Release latest docker image on: pull_request: {} push: - branches: [main] + branches: [f/node-v16] jobs: docker: @@ -27,4 +27,4 @@ jobs: uses: docker/build-push-action@v2 with: push: ${{ github.event_name == 'push' }} - tags: ghcr.io/wepublish/node:latest + tags: ghcr.io/wepublish/node:16.1 diff --git a/dockerfile b/dockerfile index a664a82..bbcd93c 100644 --- a/dockerfile +++ b/dockerfile @@ -1,19 +1,19 @@ -FROM node:12.22.6-alpine +FROM node:16.18.1-alpine -LABEL maintainer="nico@wepublish.ch" +LABEL maintainer="tomasz@wepublish.ch" RUN apk update -ARG LIBVIPS_VERSION=8.7.0 +ARG LIBVIPS_VERSION=8.13.3 ARG LIBVIPS_SOURCE_TAR=vips-${LIBVIPS_VERSION}.tar.gz ARG LIBVIPS_SOURCE_URL=https://github.com/libvips/libvips/releases/download/v${LIBVIPS_VERSION}/${LIBVIPS_SOURCE_TAR} # Install build tools -RUN apk add python gcc g++ make --update-cache +RUN apk add python3 gcc g++ make --update-cache # Install libvips dependencies RUN apk add libjpeg-turbo-dev libexif-dev lcms2-dev fftw-dev giflib-dev glib-dev libpng-dev \ - libwebp-dev expat-dev orc-dev tiff-dev librsvg-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ + libwebp-dev expat-dev orc-dev tiff-dev librsvg-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/latest-stable/main/ # Build libvips with SVG support RUN mkdir ./libvips \ From 7558040e47dc6af2101a5fda3b465955a5fa7412 Mon Sep 17 00:00:00 2001 From: Karl Merkli Date: Mon, 12 Dec 2022 13:28:47 +0100 Subject: [PATCH 2/3] chore: remove all unneeded packages from docker image --- dockerfile | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/dockerfile b/dockerfile index bbcd93c..48df6db 100644 --- a/dockerfile +++ b/dockerfile @@ -2,31 +2,5 @@ FROM node:16.18.1-alpine LABEL maintainer="tomasz@wepublish.ch" -RUN apk update - -ARG LIBVIPS_VERSION=8.13.3 -ARG LIBVIPS_SOURCE_TAR=vips-${LIBVIPS_VERSION}.tar.gz -ARG LIBVIPS_SOURCE_URL=https://github.com/libvips/libvips/releases/download/v${LIBVIPS_VERSION}/${LIBVIPS_SOURCE_TAR} - -# Install build tools -RUN apk add python3 gcc g++ make --update-cache - -# Install libvips dependencies -RUN apk add libjpeg-turbo-dev libexif-dev lcms2-dev fftw-dev giflib-dev glib-dev libpng-dev \ - libwebp-dev expat-dev orc-dev tiff-dev librsvg-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/latest-stable/main/ - -# Build libvips with SVG support -RUN mkdir ./libvips \ - && cd ./libvips \ - && wget ${LIBVIPS_SOURCE_URL} \ - && tar -xzf ${LIBVIPS_SOURCE_TAR} --strip 1 \ - && ./configure \ - --prefix=/usr \ - --enable-debug=no \ - --without-gsf \ - --disable-static \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --docdir=/usr/share/doc \ - && make \ - && make install \ No newline at end of file +RUN apk upgrade --update-cache --available && \ + rm -rf /var/cache/apk/* \ No newline at end of file From 38ff491b6bc3e7f8e5e5d864d280164c591f4c68 Mon Sep 17 00:00:00 2001 From: Elias Summermatter Date: Wed, 21 Feb 2024 11:17:50 +0100 Subject: [PATCH 3/3] Bumpet node version to v18 --- .github/workflows/image-release.yml | 4 ++-- dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml index eaa3561..60d55e9 100644 --- a/.github/workflows/image-release.yml +++ b/.github/workflows/image-release.yml @@ -3,7 +3,7 @@ name: Release latest docker image on: pull_request: {} push: - branches: [f/node-v16] + branches: [f/node-v18] jobs: docker: @@ -27,4 +27,4 @@ jobs: uses: docker/build-push-action@v2 with: push: ${{ github.event_name == 'push' }} - tags: ghcr.io/wepublish/node:16.1 + tags: ghcr.io/wepublish/node:18.1 diff --git a/dockerfile b/dockerfile index 48df6db..20aed57 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,4 @@ -FROM node:16.18.1-alpine +FROM node:18.19.1-alpine LABEL maintainer="tomasz@wepublish.ch"