dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6729 from smatvienko-tb/debian-release-for-postgres-repository

Browse Source 
[3.4] Postgresql repo from os-release $VERSION_CODENAME for dockerfile.
This commit is contained in:
Igor Kulikov 2022-06-16 11:59:25 +03:00 committed by GitHub
commit 2062ad3611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/tb/docker-cassandra/Dockerfile
View File

@ -18,7 +18,7 @@ FROM thingsboard/openjdk11
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl nmap procps gnupg2 RUN apt-get install -y curl nmap procps gnupg2
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-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 curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
RUN echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null RUN echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null
RUN curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - RUN curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add -

2
msa/tb/docker-postgres/Dockerfile
View File

@ -18,7 +18,7 @@ FROM thingsboard/openjdk11
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl gnupg2 RUN apt-get install -y curl gnupg2
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-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 curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
ENV PG_MAJOR 12 ENV PG_MAJOR 12
RUN apt-get update RUN apt-get update

2
msa/tb/pom.xml
View File

@ -160,6 +160,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<googleContainerRegistryEnabled>false</googleContainerRegistryEnabled> <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
<contextDirectory>${project.build.directory}/docker-postgres</contextDirectory> <contextDirectory>${project.build.directory}/docker-postgres</contextDirectory>
<noCache>true</noCache>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -186,6 +187,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<googleContainerRegistryEnabled>false</googleContainerRegistryEnabled> <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
<contextDirectory>${project.build.directory}/docker-cassandra</contextDirectory> <contextDirectory>${project.build.directory}/docker-cassandra</contextDirectory>
<noCache>true</noCache>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>