v1.4.2 (#65)

* resolved #62 (#63)

* use a specific version (1.25.5) of Docker Compose as the base image for Pico (#64)

* use docker compose 1.25.1 (#66)

Author: Southclaws

Dockerfile

@@ -1,3 +1,3 @@
-FROM docker/compose
+FROM docker/compose:1.25.1
 COPY pico /
 ENTRYPOINT ["/pico"]

reconfigurer/git.go

@@ -113,15 +113,25 @@ func (p *GitProvider) watchConfig() (err error) {
 		return errors.Wrap(err, "failed to watch config target")
 	}
 
+	errs := make(chan error)
 	go func() {
 		e := p.configWatcher.Run()
 		if e != nil && !errors.Is(e, context.Canceled) {
-			zap.L().Error("config watcher failed", zap.Error(e))
+			errs <- e
+		}
+		// TODO: forward these errors elsewhere.
+		for e = range p.configWatcher.Errors {
+			zap.L().Error("config watcher error occurred", zap.Error(e))
 		}
 	}()
 	zap.L().Debug("created new config watcher, awaiting setup")
 
-	<-p.configWatcher.InitialDone
+	select {
+	case <-p.configWatcher.InitialDone:
+	case err = <-errs:
+	}
+
+	zap.L().Debug("config watcher initialised")
 
 	return
 }

watcher/git.go

@@ -192,15 +192,21 @@ func (w *GitWatcher) watchTargets() (err error) {
 		return errors.Wrap(err, "failed to watch targets")
 	}
 
+	errs := make(chan error)
 	go func() {
 		e := w.targetsWatcher.Run()
 		if e != nil && !errors.Is(e, context.Canceled) {
-			w.errors <- e
+			errs <- e
 		}
+		// forward errors from the watcher to the central for-select above
+		w.errors <- <-w.targetsWatcher.Errors
 	}()
 	zap.L().Debug("created targets watcher, awaiting setup")
 
-	<-w.targetsWatcher.InitialDone
+	select {
+	case <-w.targetsWatcher.InitialDone:
+	case err = <-errs:
+	}
 
 	zap.L().Debug("targets watcher initialised")