From d58284b92fe052e611044f3a7c45e79735c39be5 Mon Sep 17 00:00:00 2001 From: Andrew Bolin <andrew.bolin@csiro.au> Date: Fri, 5 Feb 2021 10:48:33 +1100 Subject: [PATCH] add tangobox-com image for Modbus & ModbusComposer devices --- docker/tango/Makefile | 2 +- docker/tango/tangobox-com/.release | 2 ++ docker/tango/tangobox-com/Dockerfile | 4 ++++ docker/tango/tangobox-com/Makefile | 7 +++++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 docker/tango/tangobox-com/.release create mode 100644 docker/tango/tangobox-com/Dockerfile create mode 100644 docker/tango/tangobox-com/Makefile diff --git a/docker/tango/Makefile b/docker/tango/Makefile index 71ba876d..91bd0833 100644 --- a/docker/tango/Makefile +++ b/docker/tango/Makefile @@ -1,4 +1,4 @@ -DIRS = tango-builder tango-dependencies tango-db tango-cpp tango-java tango-rest tango-dsconfig ska-python-buildenv tango-pogo tango-starter tango-libtango tango-jive ska-python-runtime tango-admin tango-databaseds tango-test tango-itango tango-vscode tango-vnc tango-pytango mariadb_hdbpp tango-archiver hdbpp_viewer +DIRS = tango-builder tango-dependencies tango-db tango-cpp tango-java tango-rest tango-dsconfig ska-python-buildenv tango-pogo tango-starter tango-libtango tango-jive ska-python-runtime tango-admin tango-databaseds tango-test tango-itango tango-vscode tango-vnc tango-pytango mariadb_hdbpp tango-archiver hdbpp_viewer tango-modbus TEST = ska-python-buildenv tango-itango tango-rest tango-db tango-cpp tango-archiver BUILDDIRS = $(DIRS:%=build-%) TESTDIRS = $(TEST:%=test-%) diff --git a/docker/tango/tangobox-com/.release b/docker/tango/tangobox-com/.release new file mode 100644 index 00000000..a8c29886 --- /dev/null +++ b/docker/tango/tangobox-com/.release @@ -0,0 +1,2 @@ +release=9.2.5a +tag=tangobox-com-9.2.5a diff --git a/docker/tango/tangobox-com/Dockerfile b/docker/tango/tangobox-com/Dockerfile new file mode 100644 index 00000000..3b735147 --- /dev/null +++ b/docker/tango/tangobox-com/Dockerfile @@ -0,0 +1,4 @@ +FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:9.3.3.1 as ska + +FROM registry.gitlab.com/s2innovation/tangobox-docker/tangobox-com +COPY --from=ska /usr/local/bin/retry /usr/local/bin/retry diff --git a/docker/tango/tangobox-com/Makefile b/docker/tango/tangobox-com/Makefile new file mode 100644 index 00000000..9f046a94 --- /dev/null +++ b/docker/tango/tangobox-com/Makefile @@ -0,0 +1,7 @@ +include ../../make/Makefile + +pre-build: + @echo do some stuff before the docker build + +post-build: + @echo do some stuff after the docker build \ No newline at end of file -- GitLab