Add support for Docker API 1.38 (Issue #3)

ldflags -X not properly applied
crazy-max · Jan 22, 2019 · f5cfe21dac550d4df82d93257c6601697d61e530 · f5cfe21
1 parent b55289f
commit f5cfe21dac550d4df82d93257c6601697d61e530
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ services:
 env:
  global:
-  
-    - VERSION=0.1.2
+  
+    - VERSION=0.2.0
    - DOCKER_LOGIN=crazymax
    - DOCKER_USERNAME=crazymax
    - DOCKER_REPONAME=swarm-cronjob

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
+  
+## 0.2.0 (2019/01/22)
+  
+
+  
+* Add support for Docker API [1.38](https://docs.docker.com/engine/api/v1.38/) (Issue #3)
+  
+* ldflags -X not properly applied
+  
+
 ## 0.1.2 (2019/01/14)
 * Fix non-cronjob services added to cronjob list (Issue #2)
@@ -13,4 +18,4 @@
 ## 0.1.0 (2018/12/13)
-  
-* Initial version
+  
+* Initial version based on Docker API [1.26](https://docs.docker.com/engine/api/v1.26/)
diff --git a/Dockerfile b/Dockerfile
@@ -7,13 +7,14 @@ ARG VERSION
 WORKDIR /app
 COPY go.mod .
 COPY go.sum .
-  
-RUN go version \
-  
-  && go mod download
+  
+RUN go version
+  
+RUN go mod download
 COPY . ./
 RUN cp /usr/local/go/lib/time/zoneinfo.zip ./ \
  && CGO_ENABLED=0 GOOS=linux go build \
-  
-  -ldflags "-w -s -X 'github.com/crazy-max/swarm-cronjob/app/config.AppVersion=${VERSION}'" \
-  
-  -v -o swarm-cronjob
+  
+  -ldflags "-w -s \
+  
+    -X 'github.com/crazy-max/swarm-cronjob/internal.AppVersion=${VERSION}'" \
+  
+  -v -o swarm-cronjob cmd/main.go
 FROM scratch

diff --git a/cmd/root.go → cmd/main.go b/cmd/root.go → cmd/main.go
@@ -1,34 +1,22 @@
-  
-package cmd
+  
+package main
 import (
 	"context"
 	"os"
 	"os/signal"
+  
+	"runtime"
 	"syscall"
 	"time"
 	"github.com/crazy-max/cron"
-  
-	. "github.com/crazy-max/swarm-cronjob/app"
+  
+	. "github.com/crazy-max/swarm-cronjob/internal"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/mitchellh/mapstructure"
-  
-	"github.com/spf13/cobra"
 )
-  
-var rootCmd = &cobra.Command{
-  
-	Use: AppName,
-  
-	Run: cronRun,
-  
-}
-  
-
-  
-// Execute adds all child commands to the root command and sets flags appropriately.
-  
-func Execute() {
-  
-	if err := rootCmd.Execute(); err != nil {
-  
-		Logger.Error().Err(err).Msg("rootCmd failed")
-  
-		os.Exit(1)
-  
-	}
-  
-}
-  
-
-  
-func cronRun(cmd *cobra.Command, args []string) {
+  
+func main() {
+  
+	runtime.GOMAXPROCS(runtime.NumCPU())
 	Logger.Info().Msgf("Starting %s v%s", AppName, AppVersion)
 	dcli, err := DockerEnvClient()
@@ -41,10 +29,13 @@ func cronRun(cmd *cobra.Command, args []string) {
 		Logger.Error().Err(err).Msg("Cannot retrieve scheduled services")
 	}
+  
+	// Set timezone
 	loc, err := time.LoadLocation(GetEnv("TZ", "UTC"))
 	if err != nil {
 		Logger.Fatal().Err(err).Msgf("Failed to load time zone %s", GetEnv("TZ", "UTC"))
 	}
+  
+
+  
+	// Start cron
 	c := cron.NewWithLocation(loc)
 	for _, service := range services {
 		if _, err := CrudJob(service.Spec.Name, dcli, c); err != nil {

diff --git a/go.mod b/go.mod
@@ -1,22 +1,29 @@
 module github.com/crazy-max/swarm-cronjob
 require (
+  
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.4.11 // indirect
+  
+	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/crazy-max/cron v1.2.1
-  
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.7.0+incompatible // indirect
 	github.com/docker/docker v1.13.1
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.3.3 // indirect
-  
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+  
+	github.com/gogo/protobuf v1.2.0 // indirect
+  
+	github.com/google/go-cmp v0.2.0 // indirect
+  
+	github.com/gorilla/context v1.1.1 // indirect
+  
+	github.com/gorilla/mux v1.6.2 // indirect
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+  
+	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pkg/errors v0.8.0 // indirect
-  
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/zerolog v1.11.0
-  
-	github.com/spf13/cobra v0.0.3
-  
-	github.com/spf13/pflag v1.0.3 // indirect
-  
-	github.com/stretchr/testify v1.2.2 // indirect
+  
+	github.com/sirupsen/logrus v1.3.0 // indirect
 	golang.org/x/net v0.0.0-20181207154023-610586996380 // indirect
 	golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e // indirect
+  
+	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
+  
+	google.golang.org/grpc v1.18.0 // indirect
+  
+	gotest.tools v2.2.0+incompatible // indirect
 )
+  
+
+  
+replace github.com/docker/docker => github.com/docker/engine v0.0.0-20180718150940-a3ef7e9a9bda
diff --git a/go.sum b/go.sum
@@ -1,36 +1,79 @@
+  
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+  
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
+  
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+  
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
+  
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+  
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/crazy-max/cron v1.2.1 h1:Ls3M8vpntt6OwtICIobVy3dU81TE96jQIYePY0LlHMU=
 github.com/crazy-max/cron v1.2.1/go.mod h1:DvE0MNPY7hY+maqTJIT8n/QkBpALCFzWQQU+eG8jDTI=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/distribution v2.7.0+incompatible h1:neUDAlf3wX6Ml4HdqTrbcOHXtfRN0TFIwt6YFL7N9RU=
 github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-  
-github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M=
-  
-github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+  
+github.com/docker/engine v0.0.0-20180718150940-a3ef7e9a9bda h1:rwFtWPBEH58EmHw/8akCqMAEEFPa72YcE5Pb4bvXflI=
+  
+github.com/docker/engine v0.0.0-20180718150940-a3ef7e9a9bda/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-  
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-  
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+  
+github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
+  
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+  
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+  
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+  
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+  
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+  
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+  
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
+  
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+  
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+  
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+  
+github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
+  
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+  
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+  
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+  
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+  
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+  
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rs/zerolog v1.11.0 h1:DRuq/S+4k52uJzBQciUcofXx45GrMC6yrEbb/CoK6+M=
 github.com/rs/zerolog v1.11.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
-  
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-  
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-  
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
-  
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+  
+github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
+  
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+  
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+  
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
+  
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+  
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+  
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181207154023-610586996380 h1:zPQexyRtNYBc7bcHmehl1dH6TB3qn8zytv8cBGLDNY0=
 golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+  
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+  
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
+  
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+  
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+  
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e h1:njOxP/wVblhCLIUhjHXf6X+dzTt5OQ3vMQo9mkOIKIo=
 golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+  
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+  
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+  
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
+  
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+  
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+  
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+  
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
+  
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+  
+google.golang.org/grpc v1.18.0 h1:IZl7mfBGfbhYx2p2rKRtYgDFw6SBz+kclmxYrCksPPA=
+  
+google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+  
+gotest.tools v2.2.0+incompatible h1:y0IMTfclpMdsdIbr6uwmJn5/WZ7vFuObxDMdrylFM3A=
+  
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+  
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/app/config.go → internal/config.go b/app/config.go → internal/config.go
@@ -1,10 +1,10 @@
-  
-package app
+  
+package internal
 // Application config
 var (
 	AppName        = "swarm-cronjob"
 	AppDescription = "Create jobs on a time-based schedule on Swarm"
 	AppPackage     = "github.com/crazy-max/swarm-cronjob"
 	AppUrl         = "https://" + AppPackage
-  
-	AppVersion     = "0.1.0"
+  
+	AppVersion     = "0.0.0"
 )
diff --git a/app/cron.go → internal/cron.go b/app/cron.go → internal/cron.go
@@ -1,4 +1,4 @@
-  
-package app
+  
+package internal
 import (
 	"strconv"

diff --git a/app/helper.go → internal/helper.go b/app/helper.go → internal/helper.go
@@ -1,4 +1,4 @@
-  
-package app
+  
+package internal
 import "os"

diff --git a/app/logger.go → internal/logger.go b/app/logger.go → internal/logger.go
@@ -1,4 +1,4 @@
-  
-package app
+  
+package internal
 import (
 	"os"

diff --git a/app/swarm.go → internal/swarm.go b/app/swarm.go → internal/swarm.go
@@ -1,4 +1,4 @@
-  
-package app
+  
+package internal
 import (
 	"context"
@@ -21,7 +21,7 @@ type ServiceEvent struct {
 // DockerEnvClient initializes a new Docker API client based on environment variables
 func DockerEnvClient() (*client.Client, error) {
-  
-	c, err := client.NewEnvClient()
+  
+	c, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.12"))
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +63,7 @@ func Service(c *client.Client, name string) (swarm.Service, error) {
 // RunService runs a cron based service
 func RunService(c *client.Client, name string, skipRunning bool) {
-  
-	service, _, err := c.ServiceInspectWithRaw(context.Background(), name)
+  
+	service, _, err := c.ServiceInspectWithRaw(context.Background(), name, types.ServiceInspectOptions{})
 	if err != nil {
 		Logger.Error().Err(err).Msgf("Cannot inspect service %s", name)
 	}

diff --git a/main.go b/main.go