diff --git a/Dockerfile b/Dockerfile index f925038..5ac9687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:3.24 ARG BUILD_DATE ARG VERSION @@ -18,10 +18,11 @@ ENV RAILS_ENV="production" \ APP_VERSION=${MANYFOLD_VERSION} \ HOME=/config -COPY --from=ruby:3.4.9-alpine3.23 /usr/local /usr/local/ +COPY --from=ruby:3.4.9-alpine3.24 /usr/local /usr/local/ RUN \ apk add --no-cache \ + alembic-libs \ assimp-dev \ file \ gcompat \ @@ -30,12 +31,16 @@ RUN \ imagemagick-heic \ imagemagick-jpeg \ imagemagick-webp \ + imath \ jemalloc \ libarchive \ libucontext \ mariadb-connector-c \ + opencascade \ + openexr-libopenexr \ pciutils \ postgresql16-client \ + vtk \ yaml && \ apk add --no-cache --virtual=build-dependencies \ build-base \ @@ -47,12 +52,6 @@ RUN \ npm \ postgresql-dev \ yaml-dev && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - vtk \ - opencascade \ - imath \ - alembic-libs \ - openexr-libopenexr && \ echo "**** install manyfold F3D package ****" && \ curl -s -o \ /tmp/f3d.apk -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c5dfd3d..87ab7a8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24 ARG BUILD_DATE ARG VERSION @@ -18,10 +18,11 @@ ENV RAILS_ENV="production" \ APP_VERSION=${MANYFOLD_VERSION} \ HOME=/config -COPY --from=ruby:3.4.9-alpine3.23 /usr/local /usr/local/ +COPY --from=ruby:3.4.9-alpine3.24 /usr/local /usr/local/ RUN \ apk add --no-cache \ + alembic-libs \ assimp-dev \ file \ gcompat \ @@ -30,12 +31,16 @@ RUN \ imagemagick-heic \ imagemagick-jpeg \ imagemagick-webp \ + imath \ jemalloc \ libarchive \ libucontext \ mariadb-connector-c \ + opencascade \ + openexr-libopenexr \ pciutils \ postgresql16-client \ + vtk \ yaml && \ apk add --no-cache --virtual=build-dependencies \ build-base \ @@ -47,12 +52,6 @@ RUN \ npm \ postgresql-dev \ yaml-dev && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - vtk \ - opencascade \ - imath \ - alembic-libs \ - openexr-libopenexr && \ echo "**** install manyfold F3D package ****" && \ curl -s -o \ /tmp/f3d.apk -L \ diff --git a/README.md b/README.md index 4006f5b..07613ec 100644 --- a/README.md +++ b/README.md @@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.07.26:** - Rebase to Alpine 3.24. * **13.01.26:** - Rebase to Alpine 3.23. * **08.10.25:** - Change key init to auto generate and persist. * **27.07.25:** - Rebase to Alpine 3.22. diff --git a/readme-vars.yml b/readme-vars.yml index 6e1c62f..cc18dd5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -84,6 +84,7 @@ init_diagram: | "manyfold:latest" <- Base Images # changelog changelogs: + - {date: "05.07.26:", desc: "Rebase to Alpine 3.24."} - {date: "13.01.26:", desc: "Rebase to Alpine 3.23."} - {date: "08.10.25:", desc: "Change key init to auto generate and persist."} - {date: "27.07.25:", desc: "Rebase to Alpine 3.22."}