From 9f47cd09eda070b7f6e1b7ef907431e239883146 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 23 Jul 2017 07:02:13 +0200 Subject: [PATCH] Upgrades to current https://github.com/solsson/dockerfiles/pull/5 --- 50kafka.yml | 2 +- test/11topic-create-test1.yml | 2 +- test/12topic-create-test2.yml | 2 +- test/21consumer-test1.yml | 2 +- test/31producer-test1.yml | 2 +- test/99testclient.yml | 2 +- update-kafka-image.sh | 2 +- zookeeper/50pzoo.yml | 2 +- zookeeper/51zoo.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/50kafka.yml b/50kafka.yml index 8d4560c1..f53216dc 100644 --- a/50kafka.yml +++ b/50kafka.yml @@ -28,7 +28,7 @@ spec: cpu: 10m memory: 100Mi - name: broker - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 env: - name: JMX_PORT value: "5555" diff --git a/test/11topic-create-test1.yml b/test/11topic-create-test1.yml index d42f0eb3..536f3518 100644 --- a/test/11topic-create-test1.yml +++ b/test/11topic-create-test1.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/test/12topic-create-test2.yml b/test/12topic-create-test2.yml index 687480c8..06fe4ab9 100644 --- a/test/12topic-create-test2.yml +++ b/test/12topic-create-test2.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/test/21consumer-test1.yml b/test/21consumer-test1.yml index e1db2cf3..baac880c 100644 --- a/test/21consumer-test1.yml +++ b/test/21consumer-test1.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 command: - ./bin/kafka-console-consumer.sh - --bootstrap-server diff --git a/test/31producer-test1.yml b/test/31producer-test1.yml index 9dfe3c8d..701090c4 100644 --- a/test/31producer-test1.yml +++ b/test/31producer-test1.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 command: - /bin/sh - -c diff --git a/test/99testclient.yml b/test/99testclient.yml index ae71b0d8..8efa119c 100644 --- a/test/99testclient.yml +++ b/test/99testclient.yml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kafka - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 command: - sh - -c diff --git a/update-kafka-image.sh b/update-kafka-image.sh index 602ccdd4..1c322930 100755 --- a/update-kafka-image.sh +++ b/update-kafka-image.sh @@ -4,5 +4,5 @@ IMAGE=$1 [ -z "$IMAGE" ] && echo "First argument should be the image to set" && exit 1 for F in ./ test/ zookeeper/; do - sed -i '' "s|image: solsson/kafka:.*|image: $IMAGE|" $F*.yml + sed -i "s|image: solsson/kafka:.*|image: $IMAGE|" $F*.yml done diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index f3f666ba..16c0aa54 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -37,7 +37,7 @@ spec: cpu: 10m memory: 100Mi - name: zookeeper - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 env: - name: JMX_PORT value: "5555" diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index 43199480..8e15a7fe 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -37,7 +37,7 @@ spec: cpu: 10m memory: 100Mi - name: zookeeper - image: solsson/kafka:0.11.0.0@sha256:4c194db2ec15698aca6f1aa8a2fd5e5c566caed82b4bf43446c388f315397756 + image: solsson/kafka:0.11.0.0@sha256:92c5092d7c2f10abd11693731f6e112d40bfd42d6428a7cdf0516c9666dd3e58 env: - name: JMX_PORT value: "5555"