0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-14 19:19:09 -05:00

Minor tweaks and updates on testenv.

This commit is contained in:
Andrey Antukh 2020-10-07 13:32:39 +02:00 committed by Alonso Torres
parent 58db899a29
commit 41cb5196d1
2 changed files with 24 additions and 15 deletions

View file

@ -1,4 +1,4 @@
FROM azul/zulu-openjdk-debian:14 FROM adoptopenjdk/openjdk15:debianslim-jre
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>" LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ADD ./bundle/backend/ /opt/bundle/ ADD ./bundle/backend/ /opt/bundle/
WORKDIR /opt/bundle WORKDIR /opt/bundle

View file

@ -1,24 +1,33 @@
FROM debian:buster FROM debian:buster-slim
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>" LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ARG DEBIAN_FRONTEND=noninteractive 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; \ RUN set -ex; \
mkdir -p /etc/resolvconf/resolv.conf.d; \ mkdir -p /etc/resolvconf/resolv.conf.d; \
echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \
apt-get -qq update; \
RUN set -ex; \ apt-get -qqy install --no-install-recommends \
apt-get update && \
apt-get install -yq \
locales \ locales \
gnupg2 \ gnupg2 \
ca-certificates \ ca-certificates \
wget \ wget \
sudo \
vim \
curl \ curl \
bash \ bash \
xz-utils \
rlwrap \ 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 \ imagemagick \
netpbm \ netpbm \
potrace \ potrace \
@ -69,11 +78,11 @@ RUN set -ex; \
RUN set -ex; \ RUN set -ex; \
mkdir -p /tmp/node; \ mkdir -p /tmp/node; \
cd /tmp/node; \ cd /tmp/node; \
export PATH="$PATH:/usr/local/node-v12.18.3/bin"; \ export PATH="$PATH:/usr/local/node-v12.18.4/bin"; \
wget https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz; \ wget https://nodejs.org/dist/v12.18.4/node-v12.18.4-linux-x64.tar.xz; \
tar xvf node-v12.18.3-linux-x64.tar.xz; \ tar xvf node-v12.18.4-linux-x64.tar.xz; \
mv /tmp/node/node-v12.18.3-linux-x64 /usr/local/node-v12.18.3; \ mv /tmp/node/node-v12.18.4-linux-x64 /usr/local/node-v12.18.4; \
/usr/local/node-v12.18.3/bin/npm install -g yarn; \ /usr/local/node-v12.18.4/bin/npm install -g yarn; \
rm -rf /tmp/node; rm -rf /tmp/node;
WORKDIR /opt/app WORKDIR /opt/app
@ -81,7 +90,7 @@ WORKDIR /opt/app
ADD ./bundle/exporter/ /opt/app/ ADD ./bundle/exporter/ /opt/app/
RUN set -ex; \ 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; yarn install;
CMD ["/usr/local/node-v12.18.3/bin/node", "app.js"] CMD ["/usr/local/node-v12.18.4/bin/node", "app.js"]