From 3e7c841cdff0704eb7cbf33282f79451a36b847a Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Sat, 7 Nov 2020 14:48:45 -0700 Subject: [PATCH] feat: update dockerfiles and scripts to use ockamd version 0.10.0 --- tools/docker/demo/influxdb.sh | 4 ++-- tools/docker/influxdb/Dockerfile.influxdb-ockamd | 2 +- tools/docker/rust/Dockerfile.router | 3 --- tools/docker/telegraf/Dockerfile.telegraf-ockamd | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 tools/docker/rust/Dockerfile.router diff --git a/tools/docker/demo/influxdb.sh b/tools/docker/demo/influxdb.sh index 9ea108988de..a07af990b5c 100755 --- a/tools/docker/demo/influxdb.sh +++ b/tools/docker/demo/influxdb.sh @@ -32,7 +32,7 @@ case $1 in influxdb-ockamd) # start the responder (sink) end, containing `influxdb` and `ockamd`, with configuration to # send `influxdb` measurement data via `ockamd` over HTTP. - docker run -d --network="host" --name="influxdb-ockamd" ockam/influxdb-ockamd:0.1.0 \ + docker run -d --network="host" --name="influxdb-ockamd" ockam/influxdb-ockamd:0.10.0 \ --role=responder \ --local-socket=127.0.0.1:52440 \ --addon=influxdb,ockam_demo,http://localhost:8086 > /dev/null @@ -55,7 +55,7 @@ case $1 in --env OCKAMD_RESPONDER_PUBLIC_KEY=$2 \ --env OCKAMD_LOCAL_SOCKET=127.0.0.1:52441 \ --env OCKAMD_ROUTE=udp://127.0.0.1:52440 \ - ockam/telegraf-ockamd:0.1.0 > /dev/null + ockam/telegraf-ockamd:0.10.0 > /dev/null ;; ockam-router) diff --git a/tools/docker/influxdb/Dockerfile.influxdb-ockamd b/tools/docker/influxdb/Dockerfile.influxdb-ockamd index cd2626893fe..2b1a4fd1c37 100644 --- a/tools/docker/influxdb/Dockerfile.influxdb-ockamd +++ b/tools/docker/influxdb/Dockerfile.influxdb-ockamd @@ -1,4 +1,4 @@ FROM influxdb:1.8 -COPY --from=ockam/ockamd:0.1.0 /usr/local/bin/ockamd /usr/local/bin/ockamd +COPY --from=ockam/ockamd:0.10.0 /usr/local/bin/ockamd /usr/local/bin/ockamd COPY ./tools/docker/influxdb/entrypoint.sh . ENTRYPOINT ["./entrypoint.sh"] \ No newline at end of file diff --git a/tools/docker/rust/Dockerfile.router b/tools/docker/rust/Dockerfile.router deleted file mode 100644 index fe758cdf927..00000000000 --- a/tools/docker/rust/Dockerfile.router +++ /dev/null @@ -1,3 +0,0 @@ -FROM ubuntu:20.04 -COPY --from=builder implementations/rust/target/debug/ockamd /usr/local/bin/ockamd -CMD ["ockamd", "--role", "responder", "--local-socket"] \ No newline at end of file diff --git a/tools/docker/telegraf/Dockerfile.telegraf-ockamd b/tools/docker/telegraf/Dockerfile.telegraf-ockamd index 3b981555d54..a75eeb8b81f 100644 --- a/tools/docker/telegraf/Dockerfile.telegraf-ockamd +++ b/tools/docker/telegraf/Dockerfile.telegraf-ockamd @@ -1,3 +1,3 @@ FROM telegraf:1.16 -COPY --from=ockam/ockamd:0.1.0 /usr/local/bin/ockamd /usr/local/bin/ockamd +COPY --from=ockam/ockamd:0.10.0 /usr/local/bin/ockamd /usr/local/bin/ockamd COPY ./tools/docker/telegraf/telegraf.conf /etc/telegraf/telegraf.conf \ No newline at end of file