From c7511a228fe395b4d0512b17a8ca834887dba813 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:28:19 +0100 Subject: [PATCH] refactor: move scripts and utils to hack/ directory Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 4 ++-- Makefile | 2 +- docker-bake.hcl | 10 +++++----- {_releaser => hack/releaser}/Dockerfile | 0 {_releaser => hack/releaser}/aws.go | 0 .../releaser}/cloudfront-lambda-redirects.js | 0 {_releaser => hack/releaser}/go.mod | 2 +- {_releaser => hack/releaser}/go.sum | 0 {_releaser => hack/releaser}/main.go | 0 {_releaser => hack/releaser}/redirects-prefixes.json | 0 {_releaser => hack/releaser}/s3-config.json | 0 scripts/test_go_redirects.sh => hack/test/go_redirects | 0 scripts/test_unused_media.sh => hack/test/unused_media | 0 scripts/vendor.sh => hack/vendor | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename {_releaser => hack/releaser}/Dockerfile (100%) rename {_releaser => hack/releaser}/aws.go (100%) rename {_releaser => hack/releaser}/cloudfront-lambda-redirects.js (100%) rename {_releaser => hack/releaser}/go.mod (84%) rename {_releaser => hack/releaser}/go.sum (100%) rename {_releaser => hack/releaser}/main.go (100%) rename {_releaser => hack/releaser}/redirects-prefixes.json (100%) rename {_releaser => hack/releaser}/s3-config.json (100%) rename scripts/test_go_redirects.sh => hack/test/go_redirects (100%) rename scripts/test_unused_media.sh => hack/test/unused_media (100%) rename scripts/vendor.sh => hack/vendor (100%) diff --git a/Dockerfile b/Dockerfile index 43ecafd4e6..13194f4047 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ RUN apk add --no-cache fd ripgrep WORKDIR /test RUN --mount=type=bind,target=. <<"EOT" set -ex -./scripts/test_unused_media.sh +./hack/test/unused_media EOT # path-warnings checks for duplicate target paths @@ -145,7 +145,7 @@ RUN apk add yq COPY --from=build /project/public ./public RUN --mount=type=bind,target=. <<"EOT" set -ex -./scripts/test_go_redirects.sh +./hack/test/go_redirects EOT # release is an empty scratch image with only compiled assets diff --git a/Makefile b/Makefile index 6acc177631..8a5b14de68 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,3 @@ .PHONY: vendor vendor: ## vendor hugo modules - ./scripts/vendor.sh + ./hack/vendor diff --git a/docker-bake.hcl b/docker-bake.hcl index 1e2a252e4a..dbbf1d568c 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -73,12 +73,12 @@ target "path-warnings" { } # -# releaser targets are defined in _releaser/Dockerfile +# releaser targets are defined in hack/releaser/Dockerfile # and are used for AWS S3 deployment # target "releaser-build" { - context = "_releaser" + context = "hack/releaser" target = "releaser" output = ["type=cacheonly"] provenance = false @@ -119,7 +119,7 @@ target "_common-aws" { target "aws-s3-update-config" { inherits = ["_common-aws"] - context = "_releaser" + context = "hack/releaser" target = "aws-s3-update-config" no-cache-filter = ["aws-update-config"] output = ["type=cacheonly"] @@ -127,7 +127,7 @@ target "aws-s3-update-config" { target "aws-lambda-invoke" { inherits = ["_common-aws"] - context = "_releaser" + context = "hack/releaser" target = "aws-lambda-invoke" no-cache-filter = ["aws-lambda-invoke"] output = ["type=cacheonly"] @@ -135,7 +135,7 @@ target "aws-lambda-invoke" { target "aws-cloudfront-update" { inherits = ["_common-aws"] - context = "_releaser" + context = "hack/releaser" target = "aws-cloudfront-update" contexts = { sitedir = DOCS_SITE_DIR diff --git a/_releaser/Dockerfile b/hack/releaser/Dockerfile similarity index 100% rename from _releaser/Dockerfile rename to hack/releaser/Dockerfile diff --git a/_releaser/aws.go b/hack/releaser/aws.go similarity index 100% rename from _releaser/aws.go rename to hack/releaser/aws.go diff --git a/_releaser/cloudfront-lambda-redirects.js b/hack/releaser/cloudfront-lambda-redirects.js similarity index 100% rename from _releaser/cloudfront-lambda-redirects.js rename to hack/releaser/cloudfront-lambda-redirects.js diff --git a/_releaser/go.mod b/hack/releaser/go.mod similarity index 84% rename from _releaser/go.mod rename to hack/releaser/go.mod index 560760169a..d17c092280 100644 --- a/_releaser/go.mod +++ b/hack/releaser/go.mod @@ -1,4 +1,4 @@ -module github.com/docker/docs/_releaser +module github.com/docker/docs/hack/releaser go 1.22 diff --git a/_releaser/go.sum b/hack/releaser/go.sum similarity index 100% rename from _releaser/go.sum rename to hack/releaser/go.sum diff --git a/_releaser/main.go b/hack/releaser/main.go similarity index 100% rename from _releaser/main.go rename to hack/releaser/main.go diff --git a/_releaser/redirects-prefixes.json b/hack/releaser/redirects-prefixes.json similarity index 100% rename from _releaser/redirects-prefixes.json rename to hack/releaser/redirects-prefixes.json diff --git a/_releaser/s3-config.json b/hack/releaser/s3-config.json similarity index 100% rename from _releaser/s3-config.json rename to hack/releaser/s3-config.json diff --git a/scripts/test_go_redirects.sh b/hack/test/go_redirects similarity index 100% rename from scripts/test_go_redirects.sh rename to hack/test/go_redirects diff --git a/scripts/test_unused_media.sh b/hack/test/unused_media similarity index 100% rename from scripts/test_unused_media.sh rename to hack/test/unused_media diff --git a/scripts/vendor.sh b/hack/vendor similarity index 100% rename from scripts/vendor.sh rename to hack/vendor