mirror of
https://github.com/penpot/penpot.git
synced 2025-12-11 22:14:05 +01:00
🐳 Update devenv docker and compose files
Reuse the already builded imagemagick instead of building it again on the devenv.
This commit is contained in:
committed by
Xavier Julian
parent
91e4eeeb00
commit
dfb038b0a2
@@ -25,48 +25,6 @@ RUN set -ex; \
|
|||||||
binutils \
|
binutils \
|
||||||
build-essential autoconf libtool pkg-config
|
build-essential autoconf libtool pkg-config
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
## IMAGE MAGICK
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
FROM base AS build-imagemagick
|
|
||||||
|
|
||||||
ENV IMAGEMAGICK_VERSION=7.1.1-47 \
|
|
||||||
DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN set -ex; \
|
|
||||||
apt-get -qq update; \
|
|
||||||
apt-get -qq upgrade; \
|
|
||||||
apt-get -qqy --no-install-recommends install \
|
|
||||||
libltdl-dev \
|
|
||||||
libpng-dev \
|
|
||||||
libjpeg-dev \
|
|
||||||
libtiff-dev \
|
|
||||||
libwebp-dev \
|
|
||||||
libopenexr-dev \
|
|
||||||
libfftw3-dev \
|
|
||||||
libzip-dev \
|
|
||||||
liblcms2-dev \
|
|
||||||
liblzma-dev \
|
|
||||||
libzstd-dev \
|
|
||||||
libheif-dev \
|
|
||||||
librsvg2-dev \
|
|
||||||
; \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
RUN set -eux; \
|
|
||||||
curl -LfsSo /tmp/magick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGEMAGICK_VERSION}.tar.gz; \
|
|
||||||
mkdir -p /tmp/magick; \
|
|
||||||
cd /tmp/magick; \
|
|
||||||
tar -xf /tmp/magick.tar.gz --strip-components=1; \
|
|
||||||
./configure --prefix=/opt/imagick; \
|
|
||||||
make -j 2; \
|
|
||||||
make install; \
|
|
||||||
rm -rf /opt/imagick/lib/libMagick++*; \
|
|
||||||
rm -rf /opt/imagick/include; \
|
|
||||||
rm -rf /opt/imagick/share;
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
## NODE SETUP
|
## NODE SETUP
|
||||||
################################################################################
|
################################################################################
|
||||||
@@ -385,7 +343,7 @@ ENV LANG='C.UTF-8' \
|
|||||||
RUSTUP_HOME="/opt/rustup" \
|
RUSTUP_HOME="/opt/rustup" \
|
||||||
PATH="/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
|
PATH="/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
|
||||||
|
|
||||||
COPY --from=build-imagemagick /opt/imagick /opt/imagick
|
COPY --from=penpotapp/imagemagick:7.1.2-0 /opt/imagick /opt/imagick
|
||||||
COPY --from=setup-jvm /opt/jdk /opt/jdk
|
COPY --from=setup-jvm /opt/jdk /opt/jdk
|
||||||
COPY --from=setup-jvm /opt/clojure /opt/clojure
|
COPY --from=setup-jvm /opt/clojure /opt/clojure
|
||||||
COPY --from=setup-node /opt/node /opt/node
|
COPY --from=setup-node /opt/node /opt/node
|
||||||
|
|||||||
@@ -67,6 +67,11 @@ services:
|
|||||||
- PENPOT_LDAP_ATTRS_FULLNAME=cn
|
- PENPOT_LDAP_ATTRS_FULLNAME=cn
|
||||||
- PENPOT_LDAP_ATTRS_PHOTO=jpegPhoto
|
- PENPOT_LDAP_ATTRS_PHOTO=jpegPhoto
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
aliases:
|
||||||
|
- main
|
||||||
|
|
||||||
minio:
|
minio:
|
||||||
image: "minio/minio:RELEASE.2025-04-03T14-56-28Z"
|
image: "minio/minio:RELEASE.2025-04-03T14-56-28Z"
|
||||||
command: minio server /mnt/data --console-address ":9001"
|
command: minio server /mnt/data --console-address ":9001"
|
||||||
@@ -78,10 +83,6 @@ services:
|
|||||||
- MINIO_ROOT_USER=minioadmin
|
- MINIO_ROOT_USER=minioadmin
|
||||||
- MINIO_ROOT_PASSWORD=minioadmin
|
- MINIO_ROOT_PASSWORD=minioadmin
|
||||||
|
|
||||||
ports:
|
|
||||||
- 9000:9000
|
|
||||||
- 9001:9001
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
aliases:
|
aliases:
|
||||||
|
|||||||
Reference in New Issue
Block a user