3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎉 Update devenv: ubuntu:xenial->bionic, java: jdk8->jdk12 (zulu-openjdk).

Browse source
This commit is contained in:
Andrey Antukh 2019-09-17 16:14:49 +00:00
parent 08860e0f25
commit 4db8de8d9d
3 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docker/backend/Dockerfile
View file

@ -1,8 +1,7 @@
FROM openjdk:8-jre FROM azul/zulu-openjdk:12
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
LABEL maintainer="Monogramm Maintainers <opensource at monogramm dot io>" ENV CLOJURE_VERSION=1.10.1.469 \
ENV CLOJURE_VERSION=1.10.0.442 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8
@ -10,6 +9,7 @@ RUN set -ex; \
apt-get update -yq && \ apt-get update -yq && \
apt-get install -yq \ apt-get install -yq \
curl \ curl \
wget \
rsync \ rsync \
git \ git \
imagemagick \ imagemagick \

29
docker/devenv/Dockerfile
View file

@ -1,10 +1,10 @@
FROM ubuntu:xenial FROM ubuntu:bionic
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>" LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ARG EXTERNAL_UID=1000 ARG EXTERNAL_UID=1000
ENV NODE_VERSION=v10.16.0 \ ENV NODE_VERSION=v10.16.3 \
CLOJURE_VERSION=1.10.0.442 \ CLOJURE_VERSION=1.10.1.469 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8
@ -12,6 +12,7 @@ RUN set -ex; \
apt-get update && \ apt-get update && \
apt-get install -yq \ apt-get install -yq \
locales \ locales \
gnupg2 \
ca-certificates \ ca-certificates \
wget \ wget \
sudo \ sudo \
@ -21,7 +22,6 @@ RUN set -ex; \
zsh \ zsh \
bash \ bash \
git \ git \
openjdk-8-jdk \
rlwrap \ rlwrap \
build-essential \ build-essential \
imagemagick \ imagemagick \
@ -30,19 +30,24 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \ RUN set -ex; \
echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" >> /etc/apt/sources.list; \ mkdir -p /etc/resolvconf/resolv.conf.d; \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \ echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \
apt-get update -yq && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9; \
apt-get install -yq \ curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \
echo "deb http://repos.azulsystems.com/ubuntu stable main" >> /etc/apt/sources.list.d/zulu.list; \
echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" >> /etc/apt/sources.list.d/postgresql.list;
ARG DEBIAN_FRONTEND=noninteractive
RUN set -ex; \
apt-get -qq update; \
apt-get install -qqy zulu-12; \
apt-get install -qqy \
postgresql-11 \ postgresql-11 \
postgresql-contrib-11 \ postgresql-contrib-11 \
;\ ;\
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN set -ex; \
mkdir -p /etc/resolvconf/resolv.conf.d; \
echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail;
COPY files/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf COPY files/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
COPY files/bashrc /root/.bashrc COPY files/bashrc /root/.bashrc
COPY files/vimrc /root/.vimrc COPY files/vimrc /root/.vimrc

5
docker/frontend/Dockerfile
View file

@ -1,6 +1,5 @@
FROM nginx:1.17.2 FROM nginx:1.17.3
LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
LABEL maintainer="Monogramm Maintainers <opensource at monogramm dot io>"
ENV LANG=en_US.UTF-8 \ ENV LANG=en_US.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8