Merge branch 'main' of https://github.com/mars-protocol/multichain-li…

…quidator-bot

collector/Makefile

@@ -4,8 +4,10 @@
 
 .PHONY: default build fmt lint run run_race test clean vet docker_build docker_run docker_clean .start_redis
 
-IMAGE_NAME := "<your-cointainer-repo>/multichain-collector:latest"
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
+BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
+BASE_IMAGE_NAME := $(ECR_REPO)/multichain-collector
+IMAGE_NAME := $(BASE_IMAGE_NAME):$(BRANCH_NAME)-$(GIT_COMMIT)
 
 # This makes the APP_NAME be the name of the current directory
 # Ex. in path /home/dev/app/my-app the APP_NAME will be set to my-app

health-checker/Makefile

@@ -4,7 +4,11 @@
 
 .PHONY: default build fmt lint run run_race test clean vet docker_build docker_run docker_clean
 
-IMAGE_NAME := "<your-container-repo>/multichain-health-checker:latest"
+
+GIT_COMMIT := $(shell git rev-list -1 HEAD)
+BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
+BASE_IMAGE_NAME := $(ECR_REPO)/multichain-health-checker
+IMAGE_NAME := $(BASE_IMAGE_NAME):$(BRANCH_NAME)-$(GIT_COMMIT)
 REDBANK_ADDRESS := "osmo1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsll0sqv"
 CHAIN_ID := "liq_test"
 GIT_COMMIT := $(shell git rev-list -1 HEAD)

liquidator/Dockerfile

@@ -1,12 +1,16 @@
-FROM node:18.7.0
+FROM node:alpine
 
 ENV NODE_ENV=production
 
+# Copy accross our dependencies
+COPY package*.json /tmp/
+RUN cd /tmp && npm install
+
 WORKDIR /app
 
 COPY . /app
 
-RUN npm install
+RUN cp -r /tmp/node_modules/. /app/node_modules/
 
 RUN npx tsc --project tsconfig.json
 

liquidator/Makefile

@@ -4,8 +4,11 @@
 
 .PHONY: default build fmt lint run run_race test clean vet docker_build docker_run docker_clean
 # Add your image name here. For instance, if you are pushing to ECR, use <your-ecr>/multichain-liquidator:latest
-IMAGE_NAME := "multichain-liquidator:latest"
+
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
+BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
+BASE_IMAGE_NAME := $(ECR_REPO)/multichain-liquidator
+IMAGE_NAME := $(BASE_IMAGE_NAME):$(BRANCH_NAME)-$(GIT_COMMIT)
 
 # Required contract addresses. Refer to mars github documentation for mainnet addresses
 REDBANK_ADDRESS := "osmo1qg5ega6dykkxc307y25pecuufrjkxkaggkkxh7nad0vhyhtuhw3s0p34vn"
@@ -31,7 +34,7 @@ run_node: build ## Run the service with race condition checking enabled
 	node build/src/main.js
 
 docker_build: build ## Build the service Docker container
-	docker build -t ${IMAGE_NAME} .
+	docker build --platform=linux/amd64 -t ${IMAGE_NAME} .
 
 docker_run: ## Run the Docker container in interactive mode
 	docker run -it --rm --network="host" \

manager/Makefile

@@ -4,8 +4,10 @@
 
 .PHONY: default build fmt lint run run_race test clean vet docker_build docker_run docker_clean .start_redis
 
-IMAGE_NAME := "multichain-manager:latest"
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
+BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
+BASE_IMAGE_NAME := $(ECR_REPO)/multichain-manager
+IMAGE_NAME := $(BASE_IMAGE_NAME):$(BRANCH_NAME)-$(GIT_COMMIT)
 REDBANK_ADDRESS := "osmo1cljmlh9ctfv00ug9m3ndrsyyyfqlxnx4welnw8upgu6ylhd6hk4qchm9rt"
 AWS_ACCESS_KEY := "123456"
 AWS_ACCESS_KEY_SECRET := "abcd"