add version to container (#4)

* add version to container * remove hook dir * add instanse name to gc function logs
bringg · Jun 1, 2022 · 7ebc2af · 7ebc2af
1 parent 52914df
commit 7ebc2af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,7 +41,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         push: true
+        build-args: VERSION=${{ github.ref_name }}
         tags: |
           bringg/jenkins-autoscaler:${{ github.ref_name }}
           bringg/jenkins-autoscaler:latest
-
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.18-alpine as builder
 
-ARG SOURCE_BRANCH=development
-ENV VERSION=$SOURCE_BRANCH
+ARG VERSION=development
+ENV VERSION=$VERSION
 
 WORKDIR /opt/jenkins-autoscaler/
 COPY . .

diff --git a/hooks/build b/hooks/build
diff --git a/pkg/scaler/scaler.go b/pkg/scaler/scaler.go
@@ -461,12 +461,12 @@ func (s *Scaler) gc(ctx context.Context) error {
 		// TODO: let user specify time
 		// not taking down nodes that are running less than 20 minutes
 		if instanceLunchTime := time.Since(*instance.LaunchTime()); instanceLunchTime < 20*time.Minute {
-			logger.Infof("not taking node down since it is running only %v", instanceLunchTime)
+			logger.Infof("not taking instance %q down since it is running only %v", name, instanceLunchTime)
 
 			continue
 		}
 
-		logger.Infof("found running instance %v which is not registered in Jenkins. will try to remove it", name)
+		logger.Infof("found running instance %q which is not registered in Jenkins. will try to remove it", name)
 
 		ins.Add(instance)
 	}