From a80546593d65779173d97360e98e474aa96caf19 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 10 Jun 2021 07:04:15 +0200 Subject: [PATCH] Docker: Add another example Dockerfile for a run environment Without build tools, for demonstration purposes. Change-Id: I5940770aa0a5eb83d618ebdeb12436b38d3b21fa Reviewed-by: Christian Stenger --- ...erfile => Dockerfile-qt-5-ubuntu-20.04-build} | 0 .../docker/Dockerfile-qt-5-ubuntu-20.04-run | 16 ++++++++++++++++ tests/manual/docker/build.sh | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) rename tests/manual/docker/{Dockerfile => Dockerfile-qt-5-ubuntu-20.04-build} (100%) create mode 100644 tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-run diff --git a/tests/manual/docker/Dockerfile b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build similarity index 100% rename from tests/manual/docker/Dockerfile rename to tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build diff --git a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-run b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-run new file mode 100644 index 00000000000..4464c34c2e8 --- /dev/null +++ b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-run @@ -0,0 +1,16 @@ + +FROM ubuntu:20.04 + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + openssh-client \ + sudo \ + vim \ + wget \ + libqt5core5a \ + libqt5widgets5 \ + libqt5quick5 \ + libqt5quickcontrols2-5 \ + gdb \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* diff --git a/tests/manual/docker/build.sh b/tests/manual/docker/build.sh index 234c18463f4..f9a32d6842b 100755 --- a/tests/manual/docker/build.sh +++ b/tests/manual/docker/build.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t qt-5-ubuntu-20.04 . + +docker build -t qt-5-ubuntu-20.04-build -f Dockerfile-qt-5-ubuntu-20.04-build . +docker build -t qt-5-ubuntu-20.04-run -f Dockerfile-qt-5-ubuntu-20.04-run .