From fef4d3bdbe2a0635c5d588fc83afa9df0f46b3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 11 Sep 2024 18:08:36 +0200 Subject: [PATCH] wip --- docker/devenv/Dockerfile | 62 +++++++++++++++---------------- docker/images/Dockerfile.backend | 20 ++++------ docker/images/Dockerfile.exporter | 27 ++++++-------- 3 files changed, 51 insertions(+), 58 deletions(-) diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 7182905a6..37cc5b6ed 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -16,27 +16,27 @@ RUN set -ex; \ echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \ apt-get -qq update; \ apt-get -qqy install --no-install-recommends \ - build-essential \ - openssh-client \ - redis-tools \ - locales \ - gnupg2 \ - ca-certificates \ - wget \ - sudo \ - tmux \ - vim \ - curl \ bash \ - git \ - rlwrap \ - unzip \ - rsync \ + build-essential \ + ca-certificates \ fakeroot \ file \ - less \ + git \ + gnupg2 \ jq \ + less \ + locales \ nginx \ + openssh-client \ + redis-tools \ + rlwrap \ + rsync \ + sudo \ + tmux \ + unzip \ + url \ + vim \ + wget \ ; \ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ locale-gen; \ @@ -50,32 +50,28 @@ RUN set -ex; \ RUN set -ex; \ apt-get -qq update; \ apt-get -qqy install --no-install-recommends \ - python3 \ - python3-tabulate \ - imagemagick \ - ghostscript \ - netpbm \ - poppler-utils \ - potrace \ - webp \ - woff-tools \ - woff2 \ fontforge \ + fonts-liberation \ gconf-service \ + ghostscript \ + imagemagick \ + libappindicator1 \ libasound2 \ - libatk1.0-0 \ libatk-bridge2.0-0 \ + libatk1.0-0 \ libcairo2 \ libcups2 \ libdbus-1-3 \ libexpat1 \ libfontconfig1 \ + libgbm1 \ libgcc1 \ libgconf-2-4 \ libgdk-pixbuf2.0-0 \ libglib2.0-0 \ libgtk-3-0 \ libnspr4 \ + libnss3 \ libpango-1.0-0 \ libpangocairo-1.0-0 \ libx11-6 \ @@ -92,10 +88,14 @@ RUN set -ex; \ libxshmfence1 \ libxss1 \ libxtst6 \ - fonts-liberation \ - libappindicator1 \ - libnss3 \ - libgbm1 \ + netpbm \ + poppler-utils \ + potrace \ + python3 \ + python3-tabulate \ + webp \ + woff-tools \ + woff2 \ xvfb \ ; \ rm -rf /var/lib/apt/lists/*; diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend index db789dfd2..7121d5e16 100644 --- a/docker/images/Dockerfile.backend +++ b/docker/images/Dockerfile.backend @@ -1,6 +1,6 @@ -FROM ubuntu:22.04 - +FROM debian:bookworm LABEL maintainer="Andrey Antukh " + ENV LANG='en_US.UTF-8' \ LC_ALL='en_US.UTF-8' \ JAVA_HOME="/opt/jdk" \ @@ -13,20 +13,16 @@ RUN set -ex; \ apt-get -qq update; \ apt-get -qq upgrade; \ apt-get -qqy --no-install-recommends install \ - nano \ - curl \ - tzdata \ - locales \ ca-certificates \ + fontforge \ imagemagick \ - webp \ - rlwrap \ - fontconfig \ - woff-tools \ - woff2 \ + locales \ python3 \ python3-tabulate \ - fontforge \ + rlwrap \ + webp \ + woff-tools \ + woff2 \ ; \ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ locale-gen; \ diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index e4fceec85..a496538e0 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM debian:bookworm LABEL maintainer="Andrey Antukh " ENV LANG=en_US.UTF-8 \ @@ -13,11 +13,9 @@ RUN set -ex; \ echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \ apt-get -qq update; \ apt-get -qqy --no-install-recommends install \ - curl \ - tzdata \ - locales \ ca-certificates \ - fontconfig \ + locales \ + tzdata \ xz-utils \ ; \ rm -rf /var/lib/apt/lists/*; \ @@ -27,33 +25,32 @@ RUN set -ex; \ RUN set -ex; \ apt-get -qq update; \ apt-get -qqy install \ - imagemagick \ - ghostscript \ - netpbm \ - poppler-utils \ - potrace \ + fonts-liberation \ gconf-service \ + ghostscript \ + imagemagick \ libasound2 \ - libatk1.0-0 \ libatk-bridge2.0-0 \ + libatk1.0-0 \ libatomic1 \ libcairo2 \ libcups2 \ libdbus-1-3 \ libexpat1 \ libfontconfig1 \ + libgbm1 \ libgcc1 \ libgconf-2-4 \ libgdk-pixbuf2.0-0 \ libglib2.0-0 \ libgtk-3-0 \ libnspr4 \ + libnss3 \ libpango-1.0-0 \ libpangocairo-1.0-0 \ libx11-6 \ libx11-xcb1 \ libxcb1 \ - libxcb-dri3-0 \ libxcomposite1 \ libxcursor1 \ libxdamage1 \ @@ -65,9 +62,9 @@ RUN set -ex; \ libxshmfence1 \ libxss1 \ libxtst6 \ - fonts-liberation \ - libnss3 \ - libgbm1 \ + netpbm \ + poppler-utils \ + potrace \ ; \ rm -rf /var/lib/apt/lists/*;