lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 11:06:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update californium docker container

Browse Source 
The californium docker container was based on californium 1.0.0, which
is a very old release. This results in some SSL-related errors when
running the Qt CoAP tests in the CI.

This patch updates the docker container. Instead of a custom fork of
a californium server, we use 3.8.0 release tag, and apply a custom
patch locally.
A similar docker container is already uploaded to DockerHub and used
in Qt CoAP examples.

Task-number: QTBUG-114798
Change-Id: I07346f69a6790b4ae648e073440d68f28668cdd0
Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 2ed9f566c1)
This commit is contained in:
Ivan Solovev
2023-07-20 16:31:58 +02:00
parent b3f6c5b223
commit 92d30a74f7
3 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/shared/testserver/californium/Dockerfile
View File

@@ -1,5 +1,5 @@
FROM qt_ubuntu_18.04
ARG packages="avahi-daemon maven default-jdk"
ARG packages="avahi-daemon maven default-jdk patch"
RUN apt-get update && apt-get -y install $packages
# Get californium-based CoAP test server
@@ -7,6 +7,8 @@ WORKDIR /root/src
ADD californium-*.tar.gz .
RUN mv californium-* californium
WORKDIR /root/src/californium
ADD qt_changes.patch ./
RUN patch -p1 < qt_changes.patch
RUN mvn clean install -q -DskipTests
WORKDIR /