From b8ee8c6a0bdf4dcb74aaa96cb7b8e9146684c085 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Tue, 3 Sep 2024 16:00:00 +0530 Subject: [PATCH] argo-assets moved out --- Dockerfile | 3 ++- DockerfileEA | 3 ++- .../argoproj/argo-cd/assets => argocd-assets}/badge.svg | 0 .../argo-cd/assets => argocd-assets}/builtin-policy.csv | 0 .../argoproj/argo-cd/assets => argocd-assets}/model.conf | 0 .../argoproj/argo-cd/assets => argocd-assets}/swagger.json | 0 go.mod | 2 +- 7 files changed, 5 insertions(+), 3 deletions(-) rename {vendor/github.com/argoproj/argo-cd/assets => argocd-assets}/badge.svg (100%) rename {vendor/github.com/argoproj/argo-cd/assets => argocd-assets}/builtin-policy.csv (100%) rename {vendor/github.com/argoproj/argo-cd/assets => argocd-assets}/model.conf (100%) rename {vendor/github.com/argoproj/argo-cd/assets => argocd-assets}/swagger.json (100%) diff --git a/Dockerfile b/Dockerfile index 37df5c28c6..fc5dbe1dce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,8 @@ RUN apt clean autoclean RUN apt autoremove -y && rm -rf /var/lib/apt/lists/* COPY --from=build-env /go/src/github.com/devtron-labs/devtron/devtron . COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf . -COPY --from=build-env /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets +#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets +COPY --from=build-env /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin diff --git a/DockerfileEA b/DockerfileEA index b142d25dad..72b8e31849 100644 --- a/DockerfileEA +++ b/DockerfileEA @@ -17,7 +17,8 @@ RUN apt autoremove -y && rm -rf /var/lib/apt/lists/* COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf . COPY --from=build-env /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea . -COPY --from=build-env /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets +#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets +COPY --from=build-env /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin diff --git a/vendor/github.com/argoproj/argo-cd/assets/badge.svg b/argocd-assets/badge.svg similarity index 100% rename from vendor/github.com/argoproj/argo-cd/assets/badge.svg rename to argocd-assets/badge.svg diff --git a/vendor/github.com/argoproj/argo-cd/assets/builtin-policy.csv b/argocd-assets/builtin-policy.csv similarity index 100% rename from vendor/github.com/argoproj/argo-cd/assets/builtin-policy.csv rename to argocd-assets/builtin-policy.csv diff --git a/vendor/github.com/argoproj/argo-cd/assets/model.conf b/argocd-assets/model.conf similarity index 100% rename from vendor/github.com/argoproj/argo-cd/assets/model.conf rename to argocd-assets/model.conf diff --git a/vendor/github.com/argoproj/argo-cd/assets/swagger.json b/argocd-assets/swagger.json similarity index 100% rename from vendor/github.com/argoproj/argo-cd/assets/swagger.json rename to argocd-assets/swagger.json diff --git a/go.mod b/go.mod index 87c9902056..2ccf3a73d6 100644 --- a/go.mod +++ b/go.mod @@ -76,6 +76,7 @@ require ( go.uber.org/zap v1.21.0 golang.org/x/crypto v0.25.0 golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + golang.org/x/mod v0.17.0 golang.org/x/oauth2 v0.21.0 google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d google.golang.org/grpc v1.59.0 @@ -244,7 +245,6 @@ require ( go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect