diff --git a/Dockerfile b/Dockerfile index 75ee4c90..d8871829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,11 +36,7 @@ RUN go mod download COPY --from=node /build/dist ./dist # Copy all other files -COPY analytics ./analytics -COPY healthcheck ./healthcheck -COPY docker ./docker -COPY auth ./auth -COPY web ./web +COPY internal ./internal COPY main.go ./ # Args diff --git a/analytics/ga.go b/internal/analytics/ga.go similarity index 100% rename from analytics/ga.go rename to internal/analytics/ga.go diff --git a/analytics/types.go b/internal/analytics/types.go similarity index 100% rename from analytics/types.go rename to internal/analytics/types.go diff --git a/auth/proxy.go b/internal/auth/proxy.go similarity index 100% rename from auth/proxy.go rename to internal/auth/proxy.go diff --git a/docker/calculation.go b/internal/docker/calculation.go similarity index 100% rename from docker/calculation.go rename to internal/docker/calculation.go diff --git a/docker/calculation_test.go b/internal/docker/calculation_test.go similarity index 100% rename from docker/calculation_test.go rename to internal/docker/calculation_test.go diff --git a/docker/client.go b/internal/docker/client.go similarity index 100% rename from docker/client.go rename to internal/docker/client.go diff --git a/docker/client_test.go b/internal/docker/client_test.go similarity index 100% rename from docker/client_test.go rename to internal/docker/client_test.go diff --git a/docker/event_generator.go b/internal/docker/event_generator.go similarity index 100% rename from docker/event_generator.go rename to internal/docker/event_generator.go diff --git a/docker/event_generator_test.go b/internal/docker/event_generator_test.go similarity index 100% rename from docker/event_generator_test.go rename to internal/docker/event_generator_test.go diff --git a/docker/host.go b/internal/docker/host.go similarity index 100% rename from docker/host.go rename to internal/docker/host.go diff --git a/docker/level_guesser.go b/internal/docker/level_guesser.go similarity index 100% rename from docker/level_guesser.go rename to internal/docker/level_guesser.go diff --git a/docker/level_guesser_test.go b/internal/docker/level_guesser_test.go similarity index 100% rename from docker/level_guesser_test.go rename to internal/docker/level_guesser_test.go diff --git a/docker/types.go b/internal/docker/types.go similarity index 100% rename from docker/types.go rename to internal/docker/types.go diff --git a/healthcheck/http.go b/internal/healthcheck/http.go similarity index 100% rename from healthcheck/http.go rename to internal/healthcheck/http.go diff --git a/web/__snapshots__/web.snapshot b/internal/web/__snapshots__/web.snapshot similarity index 100% rename from web/__snapshots__/web.snapshot rename to internal/web/__snapshots__/web.snapshot diff --git a/web/auth.go b/internal/web/auth.go similarity index 100% rename from web/auth.go rename to internal/web/auth.go diff --git a/web/csp.go b/internal/web/csp.go similarity index 100% rename from web/csp.go rename to internal/web/csp.go diff --git a/web/events.go b/internal/web/events.go similarity index 98% rename from web/events.go rename to internal/web/events.go index 8325723f..9d414f31 100644 --- a/web/events.go +++ b/internal/web/events.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" log "github.com/sirupsen/logrus" ) diff --git a/web/healthcheck.go b/internal/web/healthcheck.go similarity index 100% rename from web/healthcheck.go rename to internal/web/healthcheck.go diff --git a/web/index.go b/internal/web/index.go similarity index 96% rename from web/index.go rename to internal/web/index.go index e3b508fc..af2ddf05 100644 --- a/web/index.go +++ b/internal/web/index.go @@ -10,9 +10,9 @@ import ( "os" "path" - "github.com/amir20/dozzle/analytics" - "github.com/amir20/dozzle/auth" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/analytics" + "github.com/amir20/dozzle/internal/auth" + "github.com/amir20/dozzle/internal/docker" log "github.com/sirupsen/logrus" ) diff --git a/web/logs.go b/internal/web/logs.go similarity index 99% rename from web/logs.go rename to internal/web/logs.go index be3f461f..c067b66a 100644 --- a/web/logs.go +++ b/internal/web/logs.go @@ -12,7 +12,7 @@ import ( "time" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/docker/docker/pkg/stdcopy" "github.com/dustin/go-humanize" "github.com/go-chi/chi/v5" diff --git a/web/routes.go b/internal/web/routes.go similarity index 97% rename from web/routes.go rename to internal/web/routes.go index 3c7a9cf2..f9c24b17 100644 --- a/web/routes.go +++ b/internal/web/routes.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - "github.com/amir20/dozzle/auth" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/auth" + "github.com/amir20/dozzle/internal/docker" "github.com/docker/docker/api/types" "github.com/go-chi/chi/v5" log "github.com/sirupsen/logrus" diff --git a/web/routes_auth_test.go b/internal/web/routes_auth_test.go similarity index 99% rename from web/routes_auth_test.go rename to internal/web/routes_auth_test.go index 68869582..3734016b 100644 --- a/web/routes_auth_test.go +++ b/internal/web/routes_auth_test.go @@ -15,7 +15,7 @@ import ( "github.com/magiconair/properties/assert" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/beme/abide" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/web/routes_download_test.go b/internal/web/routes_download_test.go similarity index 95% rename from web/routes_download_test.go rename to internal/web/routes_download_test.go index bf02471d..732f7071 100644 --- a/web/routes_download_test.go +++ b/internal/web/routes_download_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/beme/abide" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/web/routes_events_test.go b/internal/web/routes_events_test.go similarity index 97% rename from web/routes_events_test.go rename to internal/web/routes_events_test.go index 36842a2b..52fd369b 100644 --- a/web/routes_events_test.go +++ b/internal/web/routes_events_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/beme/abide" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/web/routes_logs_test.go b/internal/web/routes_logs_test.go similarity index 99% rename from web/routes_logs_test.go rename to internal/web/routes_logs_test.go index 083ec41a..322a762b 100644 --- a/web/routes_logs_test.go +++ b/internal/web/routes_logs_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/beme/abide" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/web/routes_test.go b/internal/web/routes_test.go similarity index 97% rename from web/routes_test.go rename to internal/web/routes_test.go index 6ab3b89e..5a8c2fce 100644 --- a/web/routes_test.go +++ b/internal/web/routes_test.go @@ -7,7 +7,7 @@ import ( "io" "io/fs" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/mock" diff --git a/web/version.go b/internal/web/version.go similarity index 100% rename from web/version.go rename to internal/web/version.go diff --git a/main.go b/main.go index 38ac76bf..26246ec6 100644 --- a/main.go +++ b/main.go @@ -13,10 +13,10 @@ import ( "time" "github.com/alexflint/go-arg" - "github.com/amir20/dozzle/analytics" - "github.com/amir20/dozzle/docker" - "github.com/amir20/dozzle/healthcheck" - "github.com/amir20/dozzle/web" + "github.com/amir20/dozzle/internal/analytics" + "github.com/amir20/dozzle/internal/docker" + "github.com/amir20/dozzle/internal/healthcheck" + "github.com/amir20/dozzle/internal/web" log "github.com/sirupsen/logrus" ) diff --git a/main_test.go b/main_test.go index 00fb0057..5e349b91 100644 --- a/main_test.go +++ b/main_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/amir20/dozzle/docker" + "github.com/amir20/dozzle/internal/docker" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/stretchr/testify/assert"