Merge branch 'master' into feature/jdk11
This commit is contained in:
commit
87ee07570d
@ -18,7 +18,7 @@ FROM thingsboard/openjdk11
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y curl nmap procps
|
||||
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
|
||||
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ sid-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
|
||||
RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
|
||||
RUN echo 'deb http://www.apache.org/dist/cassandra/debian 311x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null
|
||||
RUN curl -L https://www.apache.org/dist/cassandra/KEYS | apt-key add -
|
||||
|
||||
@ -18,7 +18,7 @@ FROM thingsboard/openjdk11
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y curl
|
||||
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
|
||||
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ sid-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
|
||||
RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
|
||||
ENV PG_MAJOR 11
|
||||
RUN apt-get update
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user