From 4c6112410ab6246529005f4041e5ae9f55cf9ef5 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Fri, 15 Nov 2024 21:19:27 +0300 Subject: [PATCH] no need to directly install imagemagick now as it comes packed with the bullseye Ruby image --- docker/Dockerfile | 5 +---- docker/Dockerfile.arm | 5 +---- docker/Dockerfile.dev | 7 ++----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 13ed1824e..ef6bdc9ee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,10 +10,7 @@ RUN apt-get update && \ # Install nodejs and imagemagick WORKDIR /opt RUN wget https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz && \ - tar xf node-v12.18.3-linux-x64.tar.xz && \ - wget https://imagemagick.org/archive/binaries/magick && \ - chmod +x magick && \ - mv magick /usr/local/bin/magick + tar xf node-v12.18.3-linux-x64.tar.xz ENV NODEJS_HOME=/opt/node-v12.18.3-linux-x64/bin ENV PATH=$NODEJS_HOME:$PATH diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm index 13ed1824e..ef6bdc9ee 100644 --- a/docker/Dockerfile.arm +++ b/docker/Dockerfile.arm @@ -10,10 +10,7 @@ RUN apt-get update && \ # Install nodejs and imagemagick WORKDIR /opt RUN wget https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz && \ - tar xf node-v12.18.3-linux-x64.tar.xz && \ - wget https://imagemagick.org/archive/binaries/magick && \ - chmod +x magick && \ - mv magick /usr/local/bin/magick + tar xf node-v12.18.3-linux-x64.tar.xz ENV NODEJS_HOME=/opt/node-v12.18.3-linux-x64/bin ENV PATH=$NODEJS_HOME:$PATH diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 7682b8719..e0131b96d 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -7,13 +7,10 @@ RUN apt-get update && \ libxslt-dev \ default-mysql-server -# Install nodejs and imagemagick +# Install nodejs WORKDIR /opt RUN wget https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz && \ - tar xf node-v12.18.3-linux-x64.tar.xz && \ - wget https://imagemagick.org/archive/binaries/magick && \ - chmod +x magick && \ - mv magick /usr/local/bin/magick + tar xf node-v12.18.3-linux-x64.tar.xz ENV NODEJS_HOME=/opt/node-v12.18.3-linux-x64/bin ENV PATH=$NODEJS_HOME:$PATH