diff --git a/docker/testenv/Dockerfile-backend b/docker/testenv/Dockerfile-backend index b84fef87d..03906855e 100644 --- a/docker/testenv/Dockerfile-backend +++ b/docker/testenv/Dockerfile-backend @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-debian:14 +FROM adoptopenjdk/openjdk15:debianslim-jre LABEL maintainer="Andrey Antukh " ADD ./bundle/backend/ /opt/bundle/ WORKDIR /opt/bundle diff --git a/docker/testenv/Dockerfile-exporter b/docker/testenv/Dockerfile-exporter index 40bce1cdd..173e3b350 100644 --- a/docker/testenv/Dockerfile-exporter +++ b/docker/testenv/Dockerfile-exporter @@ -1,24 +1,33 @@ -FROM debian:buster +FROM debian:buster-slim LABEL maintainer="Andrey Antukh " ARG DEBIAN_FRONTEND=noninteractive -ENV LANG=en_US.UTF-8 LC_ALL=C.UTF-8 +ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 RUN set -ex; \ mkdir -p /etc/resolvconf/resolv.conf.d; \ - echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; - -RUN set -ex; \ - apt-get update && \ - apt-get install -yq \ + echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \ + apt-get -qq update; \ + apt-get -qqy install --no-install-recommends \ locales \ gnupg2 \ ca-certificates \ wget \ + sudo \ + vim \ curl \ bash \ + xz-utils \ rlwrap \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen; \ + rm -rf /var/lib/apt/lists/*; + +RUN set -ex; \ + apt-get -qq update; \ + apt-get -qqy install \ imagemagick \ netpbm \ potrace \ @@ -69,11 +78,11 @@ RUN set -ex; \ RUN set -ex; \ mkdir -p /tmp/node; \ cd /tmp/node; \ - export PATH="$PATH:/usr/local/node-v12.18.3/bin"; \ - wget https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz; \ - tar xvf node-v12.18.3-linux-x64.tar.xz; \ - mv /tmp/node/node-v12.18.3-linux-x64 /usr/local/node-v12.18.3; \ - /usr/local/node-v12.18.3/bin/npm install -g yarn; \ + export PATH="$PATH:/usr/local/node-v12.18.4/bin"; \ + wget https://nodejs.org/dist/v12.18.4/node-v12.18.4-linux-x64.tar.xz; \ + tar xvf node-v12.18.4-linux-x64.tar.xz; \ + mv /tmp/node/node-v12.18.4-linux-x64 /usr/local/node-v12.18.4; \ + /usr/local/node-v12.18.4/bin/npm install -g yarn; \ rm -rf /tmp/node; WORKDIR /opt/app @@ -81,7 +90,7 @@ WORKDIR /opt/app ADD ./bundle/exporter/ /opt/app/ RUN set -ex; \ - export PATH="$PATH:/usr/local/node-v12.18.3/bin"; \ + export PATH="$PATH:/usr/local/node-v12.18.4/bin"; \ yarn install; -CMD ["/usr/local/node-v12.18.3/bin/node", "app.js"] +CMD ["/usr/local/node-v12.18.4/bin/node", "app.js"]