github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-12 15:09:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐳 Update openjdk 11 -> 13 (docker).

Browse Source
This commit is contained in:
Andrey Antukh 2020-02-04 12:35:55 +01:00
parent 49f27066b8
commit 841ace3aa8
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/buildenv/Dockerfile
View File

@ -3,7 +3,7 @@ LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ENV NODE_VERSION=v12.14.1 \ ENV NODE_VERSION=v12.14.1 \
CLOJURE_VERSION=1.10.1.492 \ CLOJURE_VERSION=1.10.1.507 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8
@ -26,10 +26,17 @@ RUN set -ex; \
rlwrap \ rlwrap \
python \ python \
build-essential \ build-essential \
openjdk-11-jdk \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 && \
echo "deb http://repos.azulsystems.com/debian stable main" >> /etc/apt/sources.list.d/zulu.list && \
apt-get -qq update && \
apt-get -qqy install zulu-13 && \
rm -rf /var/lib/apt/lists/*;
ENV JAVA_HOME=/usr/lib/jvm/zulu-13-amd64/
COPY files/bashrc /root/.bashrc COPY files/bashrc /root/.bashrc
COPY files/vimrc /root/.vimrc COPY files/vimrc /root/.vimrc
COPY files/entrypoint.sh /entrypoint.sh COPY files/entrypoint.sh /entrypoint.sh

18
docker/devenv/Dockerfile
View File

@ -5,7 +5,7 @@ ARG EXTERNAL_UID=1000
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ENV NODE_VERSION=v12.14.1 \ ENV NODE_VERSION=v12.14.1 \
CLOJURE_VERSION=1.10.1.492 \ CLOJURE_VERSION=1.10.1.507 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8
@ -32,10 +32,24 @@ RUN set -ex; \
build-essential \ build-essential \
imagemagick \ imagemagick \
webp \ webp \
openjdk-11-jdk \ jq \
; \ ; \
rm -rf /var/lib/apt/lists/*; rm -rf /var/lib/apt/lists/*;
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 && \
echo "deb http://repos.azulsystems.com/debian stable main" >> /etc/apt/sources.list.d/zulu.list && \
apt-get -qq update && \
apt-get -qqy install zulu-13 && \
rm -rf /var/lib/apt/lists/*;
ENV JAVA_HOME=/usr/lib/jvm/zulu-13-amd64/
RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && \
echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list.d/postgresql.list && \
apt-get -qq update && \
apt-get -qqy install postgresql-client-12 && \
rm -rf /var/lib/apt/lists/*;
COPY files/bashrc /root/.bashrc COPY files/bashrc /root/.bashrc
COPY files/vimrc /root/.vimrc COPY files/vimrc /root/.vimrc