Merge pull request #15 from jovijovi/dev-ci

Release v0.9.1
jovijovi · Sep 30, 2022 · 1e60290 · 1e60290
2 parents 4075a99 + 9e3b4a7
commit 1e60290
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 
-## [v0.9.0](https://github.com/jovijovi/ether-goblin/releases/tag/v0.8.6)
+## [v0.9.1](https://github.com/jovijovi/ether-goblin/releases/tag/v0.9.1)
+
+Fixes:
+
+- (watchdog): error response in init()
+
+Build:
+
+- Replace alpine by slim. Ref: <https://github.com/NomicFoundation/hardhat/issues/3195>
+
+## [v0.9.0](https://github.com/jovijovi/ether-goblin/releases/tag/v0.9.0)
 
 Features:
 

diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@ APP_NAME:=ether-goblin
 HUB:=$(if $(HUB),$(HUB),some_docker_image_repo)
 OS:=linux
 NODE_VER=16.17
+IMAGE_TAG:=slim
 TS_VER=$(shell tsc -v)
-ALPINE_VER:=3.16
 
 prj_dir:=$(shell pwd -L)
 git_br:=$(shell git -C "${prj_dir}" rev-parse --abbrev-ref HEAD | grep -v HEAD || git describe --tags || git -C "${prj_dir}" rev-parse --short HEAD)
@@ -48,7 +48,7 @@ build: build-prepare
 docker:
 	@echo "[MAKEFILE] Building docker image..."
 	@echo $(VERSION_INFO) > $(prj_dir)/git.json
-	docker build --force-rm -f $(DOCKER_FILE) --build-arg NODE_VER=$(NODE_VER) -t $(APP_NAME):$(VER) .
+	docker build --force-rm -f $(DOCKER_FILE) --build-arg NODE_VER=$(NODE_VER) --build-arg IMAGE_TAG=$(IMAGE_TAG) -t $(APP_NAME):$(VER) .
 	docker tag $(APP_NAME):$(VER) $(APP_NAME):latest
 	docker images|grep $(APP_NAME)
 	@echo "[MAKEFILE] Build docker image done"

diff --git a/devenv/app.yaml b/devenv/app.yaml
@@ -1,7 +1,7 @@
 version: '3.1'
 
 services:
-  pedrojs:
+  ether-goblin:
     container_name: devenv_ether_goblin
     image: ether-goblin:latest
     restart: always

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,7 @@
 ARG NODE_VER
+ARG IMAGE_TAG
 
-FROM node:${NODE_VER}-alpine as builder
+FROM node:${NODE_VER}-${IMAGE_TAG} as builder
 MAINTAINER pedro
 
 ADD conf /opt/app_src/conf
@@ -18,9 +19,9 @@ WORKDIR /opt/app_src
 RUN yarn install --frozen-lockfile \
     && yarn build
 
-FROM node:${NODE_VER}-alpine as runtime
+FROM node:${NODE_VER}-${IMAGE_TAG} as runtime
 
-RUN apk add --no-cache bash
+RUN apt-get update && apt-get install bash
 
 COPY --from=builder /opt/app_src/dist /opt/app
 COPY --from=builder /opt/app_src/node_modules /opt/app/node_modules

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ether-goblin",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A microservice for the Ethereum ecosystem.",
   "author": "jovijovi <mageyul@hotmail.com>",
   "license": "MIT",

diff --git a/src/watchdog/watchdog.ts b/src/watchdog/watchdog.ts
@@ -65,10 +65,10 @@ function init(): [customConfig.WatchdogConfig, boolean] {
 	const conf = customConfig.GetWatchdog();
 	if (!conf) {
 		log.RequestId().info('No watchdog configuration, skipped.');
-		return;
+		return [undefined, false];
 	} else if (!conf.enable) {
 		log.RequestId().info('Watchdog disabled.');
-		return;
+		return [undefined, false];
 	}
 
 	log.RequestId().info("Watchdog config=\n%s", JSON.stringify(conf, undefined, 4));