Skip to content

Commit 2ac1042

Browse files
lucaslorentzlucaslorentz
committed
Add root module and remove plugin module
1 parent 500809a commit 2ac1042

File tree

14 files changed

+94
-603
lines changed

14 files changed

+94
-603
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,4 +643,4 @@ $ docker rm -f caddy whoami0 whoami1
643643

644644
You can build Caddy using [xcaddy](https://github.com/caddyserver/xcaddy) or [caddy docker builder](https://hub.docker.com/_/caddy).
645645

646-
Use module name **github.com/lucaslorentz/caddy-docker-proxy/plugin** to add this plugin to your build.
646+
Use module name **github.com/lucaslorentz/caddy-docker-proxy/v2** to add this plugin to your build.

‎build.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
1616
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux \
1717
xcaddy build \
1818
--output ${ARTIFACTS}/binaries/linux/amd64/caddy \
19-
--with github.com/lucaslorentz/caddy-docker-proxy/plugin=$PWD/plugin
19+
--with github.com/lucaslorentz/caddy-docker-proxy/v2=$PWD
2020

2121
# ARM
2222
CGO_ENABLED=0 GOARCH=arm GOARM=6 GOOS=linux \
2323
xcaddy build \
2424
--output ${ARTIFACTS}/binaries/linux/arm/v6/caddy \
25-
--with github.com/lucaslorentz/caddy-docker-proxy/plugin=$PWD/plugin
25+
--with github.com/lucaslorentz/caddy-docker-proxy/v2=$PWD
2626

2727
CGO_ENABLED=0 GOARCH=arm GOARM=7 GOOS=linux \
2828
xcaddy build \
2929
--output ${ARTIFACTS}/binaries/linux/arm/v7/caddy \
30-
--with github.com/lucaslorentz/caddy-docker-proxy/plugin=$PWD/plugin
30+
--with github.com/lucaslorentz/caddy-docker-proxy/v2=$PWD
3131

3232
CGO_ENABLED=0 GOARCH=arm64 GOOS=linux \
3333
xcaddy build \
3434
--output ${ARTIFACTS}/binaries/linux/arm64/caddy \
35-
--with github.com/lucaslorentz/caddy-docker-proxy/plugin=$PWD/plugin
35+
--with github.com/lucaslorentz/caddy-docker-proxy/v2=$PWD
3636

3737
# AMD64 WINDOWS
3838
CGO_ENABLED=0 GOARCH=amd64 GOOS=windows \
3939
xcaddy build \
4040
--output ${ARTIFACTS}/binaries/windows/amd64/caddy.exe \
41-
--with github.com/lucaslorentz/caddy-docker-proxy/plugin=$PWD/plugin
41+
--with github.com/lucaslorentz/caddy-docker-proxy/v2=$PWD

‎plugin/go.mod‎ renamed to ‎go.mod‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module github.com/lucaslorentz/caddy-docker-proxy/plugin
1+
module github.com/lucaslorentz/caddy-docker-proxy/v2
22

33
go 1.17
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.5.0
7-
github.com/docker/docker v20.10.14+incompatible
6+
github.com/caddyserver/caddy/v2 v2.5.1
7+
github.com/docker/docker v20.10.16+incompatible
88
github.com/stretchr/testify v1.7.1
99
go.uber.org/zap v1.21.0
1010
)
@@ -16,7 +16,7 @@ require (
1616
github.com/Masterminds/goutils v1.1.1 // indirect
1717
github.com/Masterminds/semver/v3 v3.1.1 // indirect
1818
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
19-
github.com/Microsoft/go-winio v0.5.1 // indirect
19+
github.com/Microsoft/go-winio v0.4.14 // indirect
2020
github.com/alecthomas/chroma v0.10.0 // indirect
2121
github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f // indirect
2222
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
@@ -27,7 +27,6 @@ require (
2727
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2828
github.com/cheekybits/genny v1.0.0 // indirect
2929
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
30-
github.com/containerd/containerd v1.6.3 // indirect
3130
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
3231
github.com/davecgh/go-spew v1.1.1 // indirect
3332
github.com/dgraph-io/badger v1.6.2 // indirect
@@ -75,7 +74,7 @@ require (
7574
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
7675
github.com/mattn/go-colorable v0.1.8 // indirect
7776
github.com/mattn/go-isatty v0.0.13 // indirect
78-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
77+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
7978
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
8079
github.com/mholt/acmez v1.0.2 // indirect
8180
github.com/micromdm/scep/v2 v2.1.0 // indirect
@@ -87,9 +86,8 @@ require (
8786
github.com/morikuni/aec v1.0.0 // indirect
8887
github.com/nxadm/tail v1.4.8 // indirect
8988
github.com/onsi/ginkgo v1.16.4 // indirect
90-
github.com/onsi/gomega v1.15.0 // indirect
9189
github.com/opencontainers/go-digest v1.0.0 // indirect
92-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
90+
github.com/opencontainers/image-spec v1.0.2 // indirect
9391
github.com/pkg/errors v0.9.1 // indirect
9492
github.com/pmezard/go-difflib v1.0.0 // indirect
9593
github.com/prometheus/client_golang v1.12.1 // indirect

‎plugin/go.sum‎ renamed to ‎go.sum‎

Lines changed: 9 additions & 521 deletions
Large diffs are not rendered by default.

‎main.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package caddydockerproxy
2+
3+
import (
4+
_ "github.com/lucaslorentz/caddy-docker-proxy/v2/plugin"
5+
)

‎plugin/cmd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/caddyserver/caddy/v2"
1212
caddycmd "github.com/caddyserver/caddy/v2/cmd"
13-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/config"
14-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/generator"
13+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
14+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/generator"
1515

1616
"go.uber.org/zap"
1717
)
@@ -31,13 +31,13 @@ func init() {
3131
"Which mode this instance should run: standalone | controller | server")
3232

3333
fs.String("docker-sockets", "",
34-
"Docker sockets comma separate")
34+
"Docker sockets comma separate")
3535

3636
fs.String("docker-certs-path", "",
3737
"Docker socket certs path comma separate")
3838

3939
fs.String("docker-apis-version", "",
40-
"Docker socket apis version comma separate")
40+
"Docker socket apis version comma separate")
4141

4242
fs.String("controller-network", "",
4343
"Network allowed to configure caddy server in CIDR notation. Ex: 10.200.200.0/24")

‎plugin/generator/containers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package generator
22

33
import (
44
"github.com/docker/docker/api/types"
5-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/caddyfile"
5+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
66
"go.uber.org/zap"
77
)
88

‎plugin/generator/containers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/docker/docker/api/types"
77
"github.com/docker/docker/api/types/network"
8-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/config"
8+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
99
)
1010

1111
func TestContainers_TemplateData(t *testing.T) {

‎plugin/generator/generator.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"github.com/docker/docker/api/types"
1313
"github.com/docker/docker/api/types/swarm"
14-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/caddyfile"
15-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/config"
16-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/docker"
14+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
15+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
16+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/docker"
1717

1818
"go.uber.org/zap"
1919
)
@@ -39,11 +39,11 @@ func CreateGenerator(dockerClients []docker.Client, dockerUtils docker.Utils, op
3939
var labelRegexString = fmt.Sprintf("^%s(_\\d+)?(\\.|$)", options.LabelPrefix)
4040

4141
return &CaddyfileGenerator{
42-
options: options,
43-
labelRegex: regexp.MustCompile(labelRegexString),
44-
dockerClients: dockerClients,
45-
swarmIsAvailable: make([]bool, len(dockerClients)),
46-
dockerUtils: dockerUtils,
42+
options: options,
43+
labelRegex: regexp.MustCompile(labelRegexString),
44+
dockerClients: dockerClients,
45+
swarmIsAvailable: make([]bool, len(dockerClients)),
46+
dockerUtils: dockerUtils,
4747
}
4848
}
4949

@@ -85,7 +85,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
8585
logger.Debug("Skipping default Caddyfile because no path is set")
8686
}
8787

88-
for i, dockerClient := range(g.dockerClients){
88+
for i, dockerClient := range g.dockerClients {
8989

9090
// Add Caddyfile from swarm configs
9191
if g.swarmIsAvailable[i] {
@@ -96,7 +96,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
9696
fullConfig, _, err := dockerClient.ConfigInspectWithRaw(context.Background(), config.ID)
9797
if err != nil {
9898
logger.Error("Failed to inspect Swarm Config", zap.String("config", config.Spec.Name), zap.Error(err))
99-
99+
100100
} else {
101101
block, err := caddyfile.Unmarshal(fullConfig.Spec.Data)
102102
if err != nil {
@@ -113,7 +113,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
113113
} else {
114114
logger.Debug("Skipping swarm config caddyfiles because swarm is not available")
115115
}
116-
116+
117117
// Add containers
118118
containers, err := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{})
119119
if err == nil {
@@ -140,14 +140,14 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
140140
} else {
141141
logger.Error("Failed to get ContainerList", zap.Error(err))
142142
}
143-
143+
144144
// Add services
145145
if g.swarmIsAvailable[i] {
146146
services, err := dockerClient.ServiceList(context.Background(), types.ServiceListOptions{})
147147
if err == nil {
148148
for _, service := range services {
149149
logger.Debug("Swarm service", zap.String("service", service.Spec.Name))
150-
150+
151151
if _, isControlledServer := service.Spec.Labels[g.options.ControlledServersLabel]; isControlledServer {
152152
ips, err := g.getServiceTasksIps(&service, logger, false)
153153
if err != nil {
@@ -160,7 +160,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
160160
}
161161
}
162162
}
163-
163+
164164
// caddy. labels based config
165165
serviceCaddyfile, err := g.getServiceCaddyfile(&service, logger)
166166
if err == nil {
@@ -174,7 +174,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
174174
}
175175
} else {
176176
logger.Debug("Skipping swarm services because swarm is not available")
177-
}
177+
}
178178
}
179179

180180
// Write global blocks first
@@ -213,7 +213,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
213213

214214
func (g *CaddyfileGenerator) checkSwarmAvailability(logger *zap.Logger, isFirstCheck bool) {
215215

216-
for i, dockerClient := range(g.dockerClients){
216+
for i, dockerClient := range g.dockerClients {
217217
info, err := dockerClient.Info(context.Background())
218218
if err == nil {
219219
newSwarmIsAvailable := info.Swarm.LocalNodeState == swarm.LocalNodeStateActive
@@ -231,7 +231,7 @@ func (g *CaddyfileGenerator) checkSwarmAvailability(logger *zap.Logger, isFirstC
231231
func (g *CaddyfileGenerator) getIngressNetworks(logger *zap.Logger) (map[string]bool, error) {
232232
ingressNetworks := map[string]bool{}
233233

234-
for _, dockerClient := range(g.dockerClients){
234+
for _, dockerClient := range g.dockerClients {
235235
if len(g.options.IngressNetworks) > 0 {
236236
networks, err := dockerClient.NetworkList(context.Background(), types.NetworkListOptions{})
237237
if err != nil {

‎plugin/generator/generator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/docker/docker/api/types"
1212
"github.com/docker/docker/api/types/network"
1313
"github.com/docker/docker/api/types/swarm"
14-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/config"
15-
"github.com/lucaslorentz/caddy-docker-proxy/plugin/docker"
14+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
15+
"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/docker"
1616
"github.com/stretchr/testify/assert"
1717
"go.uber.org/zap"
1818
"go.uber.org/zap/zapcore"

0 commit comments

Comments
 (0)