Commit ae5632f8abbbfbb99395c727cd860f88c64821d6
1 parent
fdd12630
Fix docker images. Upgrade docker postgres to version 12.
Showing
4 changed files
with
10 additions
and
11 deletions
... | ... | @@ -10,6 +10,7 @@ To run the black box tests with using Docker, the local Docker images of Thingsb |
10 | 10 | As result, in REPOSITORY column, next images should be present: |
11 | 11 | |
12 | 12 | thingsboard/tb-coap-transport |
13 | + thingsboard/tb-lwm2m-transport | |
13 | 14 | thingsboard/tb-http-transport |
14 | 15 | thingsboard/tb-mqtt-transport |
15 | 16 | thingsboard/tb-node | ... | ... |
... | ... | @@ -17,15 +17,14 @@ |
17 | 17 | FROM thingsboard/openjdk11 |
18 | 18 | |
19 | 19 | RUN apt-get update |
20 | -RUN apt-get install -y curl nmap procps | |
21 | -RUN echo 'deb http://ftp.us.debian.org/debian sid main' | tee --append /etc/apt/sources.list.d/debian.list > /dev/null | |
22 | -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ sid-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null | |
20 | +RUN apt-get install -y curl nmap procps gnupg2 | |
21 | +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null | |
23 | 22 | RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - |
24 | 23 | RUN echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null |
25 | 24 | RUN curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - |
26 | -ENV PG_MAJOR=11 | |
25 | +ENV PG_MAJOR=12 | |
27 | 26 | RUN apt-get update |
28 | -RUN apt-get install -y cassandra cassandra-tools postgresql-11 | |
27 | +RUN apt-get install -y cassandra cassandra-tools postgresql-12 | |
29 | 28 | RUN update-rc.d cassandra disable |
30 | 29 | RUN update-rc.d postgresql disable |
31 | 30 | RUN sed -i.old '/ulimit/d' /etc/init.d/cassandra | ... | ... |
... | ... | @@ -17,13 +17,12 @@ |
17 | 17 | FROM thingsboard/openjdk11 |
18 | 18 | |
19 | 19 | RUN apt-get update |
20 | -RUN apt-get install -y curl | |
21 | -RUN echo 'deb http://ftp.us.debian.org/debian sid main' | tee --append /etc/apt/sources.list.d/debian.list > /dev/null | |
22 | -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ sid-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null | |
20 | +RUN apt-get install -y curl gnupg2 | |
21 | +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null | |
23 | 22 | RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - |
24 | -ENV PG_MAJOR 11 | |
23 | +ENV PG_MAJOR 12 | |
25 | 24 | RUN apt-get update |
26 | -RUN apt-get install -y postgresql-11 | |
25 | +RUN apt-get install -y postgresql-12 | |
27 | 26 | RUN update-rc.d postgresql disable |
28 | 27 | |
29 | 28 | COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ | ... | ... |
... | ... | @@ -39,7 +39,7 @@ |
39 | 39 | <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name> |
40 | 40 | <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name> |
41 | 41 | <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder> |
42 | - <pkg.upgradeVersion>2.4.2</pkg.upgradeVersion> | |
42 | + <pkg.upgradeVersion>3.3.0</pkg.upgradeVersion> | |
43 | 43 | </properties> |
44 | 44 | |
45 | 45 | <dependencies> | ... | ... |