misc: cleanup Dockerfiles

* Cleanup: Use spaces instead of tabulation

* Cleanup: Reduce layers

* Cleanup: Homogeneise wget syntax

* Cleanup: Use binary GPG key format
This commit is contained in:
Berbe
2021-09-17 09:49:49 +02:00
committed by GitHub
parent 09cf0a8951
commit be1da0e2be
8 changed files with 82 additions and 107 deletions

View File

@@ -2,10 +2,9 @@ ARG JITSI_REPO=jitsi
ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base:${BASE_TAG}
RUN \
mkdir -p /usr/share/man/man1 && \
wget -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public -O /etc/apt/trusted.gpg.d/openjdk.asc && \
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
apt-cleanup
RUN mkdir -p /usr/share/man/man1 && \
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
apt-cleanup