refactor: move container into pkg

containrrr · Jul 21, 2019 · 74ce927 · 74ce927
1 parent e109a7a
commit 74ce927
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 7 deletions.
diff --git a/actions/actions_suite_test.go b/actions/actions_suite_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/containrrr/watchtower/actions"
-	"github.com/containrrr/watchtower/container"
-	"github.com/containrrr/watchtower/container/mocks"
+	"github.com/containrrr/watchtower/pkg/container"
+	"github.com/containrrr/watchtower/pkg/container/mocks"
 	"github.com/docker/docker/api/types"
 
 	t "github.com/containrrr/watchtower/pkg/types"

diff --git a/actions/check.go b/actions/check.go
@@ -11,7 +11,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/containrrr/watchtower/container"
+	"github.com/containrrr/watchtower/pkg/container"
 )
 
 // CheckForMultipleWatchtowerInstances will ensure that there are not multiple instances of the

diff --git a/actions/update.go b/actions/update.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/containrrr/watchtower/container"
+	"github.com/containrrr/watchtower/pkg/container"
 	t "github.com/containrrr/watchtower/pkg/types"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/cmd/root.go b/cmd/root.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/containrrr/watchtower/actions"
-	"github.com/containrrr/watchtower/container"
+	"github.com/containrrr/watchtower/pkg/container"
 	"github.com/containrrr/watchtower/internal/flags"
 	"github.com/containrrr/watchtower/notifications"
 	t "github.com/containrrr/watchtower/pkg/types"

diff --git a/container/client.go → pkg/container/client.go b/container/client.go → pkg/container/client.go
diff --git a/container/container.go → pkg/container/container.go b/container/container.go → pkg/container/container.go
diff --git a/container/container_test.go → pkg/container/container_test.go b/container/container_test.go → pkg/container/container_test.go
@@ -1,7 +1,7 @@
 package container
 
 import (
-	"github.com/containrrr/watchtower/container/mocks"
+	"github.com/containrrr/watchtower/pkg/container/mocks"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	cli "github.com/docker/docker/client"

diff --git a/container/filters.go → pkg/container/filters.go b/container/filters.go → pkg/container/filters.go
diff --git a/container/filters_test.go → pkg/container/filters_test.go b/container/filters_test.go → pkg/container/filters_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/containrrr/watchtower/container/mocks"
+	"github.com/containrrr/watchtower/pkg/container/mocks"
 )
 
 func TestWatchtowerContainersFilter(t *testing.T) {

diff --git a/container/mocks/ApiServer.go → pkg/container/mocks/ApiServer.go b/container/mocks/ApiServer.go → pkg/container/mocks/ApiServer.go
diff --git a/container/mocks/FilterableContainer.go → pkg/container/mocks/FilterableContainer.go b/container/mocks/FilterableContainer.go → pkg/container/mocks/FilterableContainer.go
diff --git a/container/mocks/data/container_running.json → ...ntainer/mocks/data/container_running.json b/container/mocks/data/container_running.json → ...ntainer/mocks/data/container_running.json
diff --git a/container/mocks/data/container_stopped.json → ...ntainer/mocks/data/container_stopped.json b/container/mocks/data/container_stopped.json → ...ntainer/mocks/data/container_stopped.json
diff --git a/container/mocks/data/containers.json → pkg/container/mocks/data/containers.json b/container/mocks/data/containers.json → pkg/container/mocks/data/containers.json
diff --git a/container/mocks/data/image01.json → pkg/container/mocks/data/image01.json b/container/mocks/data/image01.json → pkg/container/mocks/data/image01.json
diff --git a/container/mocks/data/image02.json → pkg/container/mocks/data/image02.json b/container/mocks/data/image02.json → pkg/container/mocks/data/image02.json
diff --git a/container/sort.go → pkg/container/sort.go b/container/sort.go → pkg/container/sort.go
diff --git a/container/trust.go → pkg/container/trust.go b/container/trust.go → pkg/container/trust.go
diff --git a/container/trust_test.go → pkg/container/trust_test.go b/container/trust_test.go → pkg/container/trust_test.go