diff --git a/manager/Dockerfile b/manager/Dockerfile index bed0bf6..d8b87ff 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -8,11 +8,19 @@ RUN go build -o sai-interx-manager -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv RUN apt-get update && apt-get -y install ca-certificates COPY --from=build /src/sai-interx-manager /srv/ +COPY --from=build /src/config.yml /srv/config.yml RUN chmod +x /srv/sai-interx-manager +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + CMD /srv/sai-interx-manager start > /srv/logs/app.log 2>&1 diff --git a/manager/config.yml b/manager/config.yml index 6f3714c..76f1dee 100644 --- a/manager/config.yml +++ b/manager/config.yml @@ -6,13 +6,13 @@ common: enabled: false port: 8881 -version: "v0.10.5" +version: "v0.10.6" storage: token: "" - url: "http://worker-sai-storage:8880" + url: "http://storage.local:8880" ethereum: - interaction: "http://worker-sai-ethereum-interaction:8882" + interaction: "http://ethereum-interaction.local:8882" nodes: chain1: "https://data-seed-prebsc-1-s1.bnbchain.org:8545" token: "" @@ -21,14 +21,14 @@ ethereum: rate_limit: 100000 cosmos: node: - json_rpc: "" - tendermint: "" + json_rpc: "sekai.local:9090" + tendermint: "http://sekai.local:26657" tx_modes: sync: true async: true block: true gw_timeout: 30 - interaction: "http://worker-sai-cosmos-interaction:8884" + interaction: "http://cosmos-interaction.local:8884" token: "" retries: 1 retry_delay: 10 diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 5731b77..8d3a8f0 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -8,11 +8,19 @@ RUN go build -o sai-interax-proxy -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv RUN apt-get update && apt-get -y install ca-certificates COPY --from=build /src/sai-interax-proxy /srv/ +COPY --from=build /src/config.yml /srv/config.yml RUN chmod +x /srv/sai-interax-proxy +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + CMD /srv/sai-interax-proxy start > /srv/logs/app.log 2>&1 diff --git a/proxy/config.yml b/proxy/config.yml index 54fc7c8..c3f9789 100644 --- a/proxy/config.yml +++ b/proxy/config.yml @@ -7,4 +7,4 @@ common: port: 8881 manager: - url: http://manager:8080 + url: http://manager.local:8080 diff --git a/worker/cosmos/sai-cosmos-indexer/Dockerfile b/worker/cosmos/sai-cosmos-indexer/Dockerfile index 6cc5705..6fbdcd8 100644 --- a/worker/cosmos/sai-cosmos-indexer/Dockerfile +++ b/worker/cosmos/sai-cosmos-indexer/Dockerfile @@ -9,6 +9,10 @@ RUN go build -o sai-cosmos-indexer -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv RUN apt-get update && apt-get -y install ca-certificates @@ -17,5 +21,11 @@ COPY --from=build /src/sai-cosmos-indexer /srv/ RUN chmod +x /srv/sai-cosmos-indexer +# Copy config file +COPY config.yml /srv/config.yml + +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + # Set command to run your binary CMD /srv/sai-cosmos-indexer start diff --git a/worker/cosmos/sai-cosmos-indexer/config.yml b/worker/cosmos/sai-cosmos-indexer/config.yml index ddd33e0..0ae0e88 100644 --- a/worker/cosmos/sai-cosmos-indexer/config.yml +++ b/worker/cosmos/sai-cosmos-indexer/config.yml @@ -7,17 +7,19 @@ common: port: 8081 storage: - token: "12345" - url: "http://localhost:8880" - email: "email" - password: "pass" - mongo_collection_name: "Ethereum" + token: "" + url: "http://storage.local:8880" + email: "" + password: "" + mongo_collection_name: "cosmos" notifier: token: "lafijsiadnm/a@@#lsa$fd8f" url: "http://localhost:8885" sender_id: "Cosmos" -node_address: "http://localhost:1317" -start_block: 857 -tx_type: "/kira.bridge.MsgChangeCosmosEthereum" -sleep_duration: 2 \ No newline at end of file +node_address: "http://sekai.local:26657" +start_block: 1 +tx_type: "" +sleep_duration: 2 +handle_blocks: true +skip_faile_tx: false \ No newline at end of file diff --git a/worker/cosmos/sai-cosmos-interaction/Dockerfile b/worker/cosmos/sai-cosmos-interaction/Dockerfile index ac9ab7c..f0711ed 100644 --- a/worker/cosmos/sai-cosmos-interaction/Dockerfile +++ b/worker/cosmos/sai-cosmos-interaction/Dockerfile @@ -9,6 +9,10 @@ RUN go build -o sai-cosmos-interaction -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv RUN apt-get update && apt-get -y install ca-certificates @@ -17,5 +21,11 @@ COPY --from=build /src/sai-cosmos-interaction /srv/ RUN chmod +x /srv/sai-cosmos-interaction +# Copy config file +COPY config.yml /srv/config.yml + +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + # Set command to run your binary CMD /srv/sai-cosmos-interaction start diff --git a/worker/ethereum/sai-ethereum-contract-interaction/Dockerfile b/worker/ethereum/sai-ethereum-contract-interaction/Dockerfile index 7f7dfad..be308f0 100644 --- a/worker/ethereum/sai-ethereum-contract-interaction/Dockerfile +++ b/worker/ethereum/sai-ethereum-contract-interaction/Dockerfile @@ -8,6 +8,10 @@ RUN go build -o sai-eth-interaction -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv # Copy binary from build stage @@ -18,5 +22,11 @@ COPY --from=build /src/sai-eth-interaction /srv/sai-eth-interaction RUN chmod +x /srv/sai-eth-interaction +# Copy config file +COPY config.yml /srv/config.yml + +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + # Set command to run your binary CMD /srv/sai-eth-interaction start diff --git a/worker/ethereum/sai-ethereum-indexer/Dockerfile b/worker/ethereum/sai-ethereum-indexer/Dockerfile index 9110fd0..092fd82 100644 --- a/worker/ethereum/sai-ethereum-indexer/Dockerfile +++ b/worker/ethereum/sai-ethereum-indexer/Dockerfile @@ -9,6 +9,10 @@ RUN go build -o sai-eth-indexer -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv RUN apt-get update && apt-get -y install ca-certificates @@ -17,5 +21,11 @@ COPY --from=build /src/cmd/app/sai-eth-indexer /srv/ RUN chmod +x /srv/sai-eth-indexer +# Copy config file +COPY config.json /srv/config.json + +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + # Set command to run your binary CMD /srv/sai-eth-indexer --debug diff --git a/worker/ethereum/sai-ethereum-indexer/config.json b/worker/ethereum/sai-ethereum-indexer/config.json index f36f8b4..3d73e95 100644 --- a/worker/ethereum/sai-ethereum-indexer/config.json +++ b/worker/ethereum/sai-ethereum-indexer/config.json @@ -21,7 +21,7 @@ "storage": { "collection": "Ethereum", "token": "12345", - "url": "http://localhost:8880", + "url": "http://storage.local:8880", "email": "", "password": "" }, diff --git a/worker/sai-storage-mongo/Dockerfile b/worker/sai-storage-mongo/Dockerfile index c9293f3..1fe93ce 100644 --- a/worker/sai-storage-mongo/Dockerfile +++ b/worker/sai-storage-mongo/Dockerfile @@ -9,6 +9,10 @@ RUN go build -o sai-storage-bin -buildvcs=false FROM ubuntu +# Accept VERSION build arg and set as environment variable +ARG VERSION=unknown +ENV VERSION=${VERSION} + WORKDIR /srv # Copy binary from build stage @@ -19,6 +23,12 @@ COPY --from=build /src/sai-storage-bin /srv/sai-storage-bin RUN chmod +x /srv/sai-storage-bin +# Copy config file +COPY config.yml /srv/config.yml + +# Write version to file for easy inspection +RUN echo "${VERSION}" > /srv/VERSION + # Set command to run your binary CMD /srv/sai-storage-bin start diff --git a/worker/sai-storage-mongo/config.yml b/worker/sai-storage-mongo/config.yml index da70a41..c8f2017 100644 --- a/worker/sai-storage-mongo/config.yml +++ b/worker/sai-storage-mongo/config.yml @@ -11,7 +11,7 @@ common: port: 8881 storage: atlas: false - host: "mongo-db" + host: "mongo.local" port: "27017" user: "" pass: ""