go 1.19

Author: LeKovr

Dockerfile

@@ -1,9 +1,13 @@
 ARG GOLANG_VERSION
 
 # FROM golang:$GOLANG_VERSION as builder
-FROM ghcr.io/dopos/golang-alpine:v1.16.10-alpine3.14.2 as builder
+#FROM ghcr.io/dopos/golang-alpine:v1.16.10-alpine3.14.2 as builder
+FROM golang:1.19.0-alpine3.16 as builder
 ARG TARGETARCH
 
+# for docker.io/golang:1.18-alpine
+RUN apk --update add git
+
 WORKDIR /opt/app
 
 # Cached layer

Makefile

@@ -30,7 +30,8 @@ DOCKER_IMAGE  ?= ghcr.io/lekovr/$(PRG)
 # Hardcoded in docker-compose.yml service name
 DC_SERVICE    ?= app
 
-# docker-compose image version
+# docker-compose image and version
+DC_IMAGE      ?= docker/compose
 DC_VER        ?= latest
 
 # docker app for change inside containers
@@ -172,10 +173,9 @@ dc: docker-compose.yml
   --env=LOG_DIR=$(LOG_DIR) \
   --env=DOCKER_IMAGE=$(DOCKER_IMAGE) \
   --env=GOLANG_VERSION=$(GOLANG_VERSION) \
-  docker/compose:$(DC_VER) \
+  $(DC_IMAGE):$(DC_VER) \
   -p $(PRG) \
   "$(CMD)"
-
 # ------------------------------------------------------------------------------
 ## Other
 #:

go.mod

@@ -1,6 +1,6 @@
 module github.com/LeKovr/webtail
 
-go 1.18
+go 1.19
 
 require (
 	github.com/a8m/djson v0.0.0-20170509170705-c02c5aef757f

wtc_test.go

@@ -62,9 +62,9 @@ func NewWebTailClient(t *testing.T, cfg *webtail.Config) (*WebTailClient, error)
 }
 
 func (wtc *WebTailClient) WaitSync(syncs int) {
-	for i := 0; i < syncs; i++ {
 		ticker := time.NewTicker(time.Duration(1) * time.Second)
 		defer ticker.Stop()
+	for i := 0; i < syncs; i++ {
 		select {
 		case <-wtc.feedBackChan:
 			wtc.t.Log("sync received")