add shard-amqp.yml to shard.yml, delete shard-amqp.yml add crystal-etcd to shard.yml

Signed-off-by: Cao Xueliang caoxl78320@163.com --- container/crystal-shards/Dockerfile | 3 --- container/crystal-shards/shard-amqp.yml | 7 ------- container/crystal-shards/shard.yml | 9 ++++++--- 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 container/crystal-shards/shard-amqp.yml

diff --git a/container/crystal-shards/Dockerfile b/container/crystal-shards/Dockerfile index 15fe523..d3e321f 100644 --- a/container/crystal-shards/Dockerfile +++ b/container/crystal-shards/Dockerfile @@ -17,8 +17,5 @@ sed -i '99s/arguments[:id]/arguments[:id]?/' /usr/share/crystal/app/lib/elast sed -i 's/, Utils.__listify(arguments[:q].as(String))/ /' /usr/share/crystal/app/lib/elasticsearch-crystal/src/elasticsearch/api/actions/search.cr;\ sed -i '205a \ params.clear' /usr/share/crystal/app/lib/elasticsearch-crystal/src/elasticsearch/api/actions/search.cr;

-COPY shard-amqp.yml /usr/share/crystal/app/shard.yml -RUN shards - CMD ["bash"]

diff --git a/container/crystal-shards/shard-amqp.yml b/container/crystal-shards/shard-amqp.yml deleted file mode 100644 index aea87cc..0000000 --- a/container/crystal-shards/shard-amqp.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: monitor -version: 0.1.0 - -dependencies: - amqp-client: - github: cloudamqp/amqp-client.cr - version: 0.5.14 diff --git a/container/crystal-shards/shard.yml b/container/crystal-shards/shard.yml index ca8f72e..3466bc5 100644 --- a/container/crystal-shards/shard.yml +++ b/container/crystal-shards/shard.yml @@ -8,7 +8,7 @@ targets: scheduler: main: src/scheduler.cr

-crystal: 0.33.0 +crystal: 0.35.0

license: Mulan PSL v2

@@ -17,10 +17,8 @@ dependencies: github: kemalcr/kemal redis: github: stefanwille/crystal-redis - version: ~> 2.5.3 elasticsearch-crystal: github: paktek123/elasticsearch-crystal - version: ~> 0.14 any_merge: github: icyleaf/any_merge branch: master @@ -32,3 +30,8 @@ dependencies: github: z64/rate_limiter singleton: github: waterlink/singleton.cr + etcd: + github: PythonEngineer007/crystal-etcd + branch: master + amqp-client: + github: cloudamqp/amqp-client.cr