Merge branch 'dev' into 5739-refactor-dockerfile

refs #5739 minor fixes
refs #5739 dockerfile refactored
2023-06-21 05:13:52 +00:00 · 2023-06-12 07:42:14 +02:00 · 2023-06-09 14:00:14 +02:00
1 changed files with 7 additions and 2 deletions
--- a/9
+++ b/9
@ -10,7 +10,6 @@ RUN apt-get update \
        curl \
        ca-certificates \
        gnupg2 \
-        graphicsmagick \
    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
    && apt-get install -y --no-install-recommends nodejs \
    && npm install -g npm@9.6.6
@ -26,9 +25,15 @@ RUN apt-get update \
        libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
        fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
-    && rm -rf /var/lib/apt/lists/* \
    && npm -g install pm2

+# Additional libraries
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        graphicsmagick \
+    && rm -rf /var/lib/apt/lists/*
+
 # Salix

 WORKDIR /salix
Author	SHA1	Message	Date
Alex Moreno	50e43f764b	Merge branch 'dev' into 5739-refactor-dockerfile gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-21 05:13:52 +00:00
Alexandre Riera	ab44b51bba	refs #5739 minor fixes gitea/salix/pipeline/head This commit looks good Details	2023-06-12 07:42:14 +02:00
Alexandre Riera	3e6e284861	refs #5739 dockerfile refactored gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-09 14:00:14 +02:00