0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-12 10:09:03 -05:00

Minor improvements on docker images.

This commit is contained in:
Andrey Antukh 2021-01-26 12:57:21 +01:00
parent c0fb108e06
commit 7f3ef7bb82
5 changed files with 34 additions and 16 deletions

View file

@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM ubuntu:20.04
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ENV LANG='en_US.UTF-8' LC_ALL='en_US.UTF-8'
@ -11,7 +11,7 @@ RUN set -ex; \
mkdir -p /usr/share/man/man1; \
mkdir -p /usr/share/man/man7; \
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -; \
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" >> /etc/apt/sources.list.d/adoptopenjdk.list; \
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ focal main" >> /etc/apt/sources.list.d/adoptopenjdk.list; \
apt-get -qq update; \
apt-get -qqy install adoptopenjdk-15-hotspot; \
rm -rf /var/lib/apt/lists/*;

View file

@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM ubuntu:20.04
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ARG DEBIAN_FRONTEND=noninteractive
@ -71,12 +71,6 @@ RUN set -ex; \
; \
rm -rf /var/lib/apt/lists/*;
RUN set -ex; \
wget https://github.com/RazrFalcon/svgcleaner/releases/download/v0.9.5/svgcleaner_linux_x86_64_0.9.5.tar.gz; \
tar xvf svgcleaner_linux_x86_64_0.9.5.tar.gz; \
mv svgcleaner /usr/local/bin/; \
rm -rf svgcleaner_linux_x86_64_0.9.5.tar.gz;
RUN set -ex; \
mkdir -p /tmp/node; \
cd /tmp/node; \

View file

@ -34,20 +34,37 @@ services:
- penpot-redis
environment:
- PENPOT_ASSERTS_ENABLED=false
- PENPOT_DEBUG=false
# Used for creating tokens, important to be true random value
- PENPOT_SECRET_KEY=provide-here-a-secret-random-key
# Mainly used in logging, not important setting.
- PENPOT_HOST=example.penpot
# Standard database connection parametes (only postgresql is supported):
- PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot
- PENPOT_DATABASE_USERNAME=penpot
- PENPOT_DATABASE_PASSWORD=penpot
# Redis is used for the websockets notifications.
- PENPOT_REDIS_URI=redis://penpot-redis/0
- PENPOT_STORAGE_FS_DIRECTORY_=/opt/data/assets
- PENPOT_STORAGE_FS_URI=http://penpot-frontend/internal/assets
- PENPOT_STORAGE_BACKEND=fs
- PENPOT_STORAGE_FS_DIRECTORY_=/opt/data/assets
- PENPOT_LOCAL_ASSETS_URI=http://penpot-frontend/internal/assets
# Enable telemetry Telemetry consists on sending collected
# anonymous data to us in order to learn about the use of penpot
# and improve the platform based on real scenarios. If yo want
# to help us, please leave it enabled. In any case you can see
# the source code of the telemetry client and server in the
# penpot repository, all is open source.
- PENPOT_TELEMETRY_ENABLED=true
- PENPOT_TELEMETRY_URI=https://telemetry.penpot.app
# Email sending configuration.
- PENPOT_SMTP_ENABLED=false
- PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com
- PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com
- PENPOT_SECRET_KEY=provide-here-a-secret-random-key
# - PENPOT_SMTP_HOST=...
# - PENPOT_SMTP_PORT=...
# - PENPOT_SMTP_USERNAME=...
@ -56,6 +73,10 @@ services:
# - PENPOT_SMTP_SSL=false
# - PENPOT_GOOGLE_CLIENT_ID=...
# - PENPOT_GOOGLE_CLIENT_SECRET=...
- PENPOT_ASSERTS_ENABLED=false
- PENPOT_DEBUG=false
networks:
- penpot

View file

@ -2,7 +2,6 @@
set -ex
export PATH="/usr/local/node-v12.18.3/bin/:$PATH"
# yarn install
export PATH="/usr/local/nodejs/bin/:$PATH"
exec "$@"

View file

@ -74,6 +74,10 @@ http {
proxy_pass http://penpot-backend:6060/api;
}
location /dbg {
proxy_pass http://penpot-backend:6060/dbg;
}
location /export {
proxy_pass http://penpot-exporter:6061;
}