From aa45662c5c5dae4752892ef0a62b2ab0c544353f Mon Sep 17 00:00:00 2001 From: Vicente Cheng Date: Thu, 9 May 2024 17:11:33 +0800 Subject: [PATCH] build: remove dist - NDM did not need this Signed-off-by: Vicente Cheng --- .dockerignore | 1 - .gitignore | 1 - Dockerfile.dapper | 2 +- scripts/entry | 2 +- scripts/package | 3 --- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index bec10c10..2c64c3e5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,2 @@ ./.dapper ./.cache -./dist diff --git a/.gitignore b/.gitignore index 4d328849..01227f33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /.dapper /.cache /bin -/dist *.swp .idea diff --git a/Dockerfile.dapper b/Dockerfile.dapper index f89a2d6c..1d8f788e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -22,7 +22,7 @@ RUN go install k8s.io/code-generator/cmd/openapi-gen@v0.23.7 ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS BUILD_FOR_CI ENV DAPPER_SOURCE /go/src/github.com/harvester/node-disk-manager/ -ENV DAPPER_OUTPUT ./bin ./dist ./manifests +ENV DAPPER_OUTPUT ./bin ./manifests ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE} diff --git a/scripts/entry b/scripts/entry index 78fb5679..c58311c9 100755 --- a/scripts/entry +++ b/scripts/entry @@ -1,7 +1,7 @@ #!/bin/bash set -e -mkdir -p bin dist +mkdir -p bin if [ -e ./scripts/$1 ]; then ./scripts/"$@" else diff --git a/scripts/package b/scripts/package index 0c1473df..b45d182f 100755 --- a/scripts/package +++ b/scripts/package @@ -5,9 +5,6 @@ source $(dirname $0)/version cd $(dirname $0)/.. -mkdir -p dist/artifacts -cp bin/node-disk-manager dist/artifacts/node-disk-manager${SUFFIX} - IMAGE=${REPO}/node-disk-manager:${TAG} if [[ -n ${BUILD_FOR_CI} ]]; then IMAGE=ttl.sh/node-disk-manager-${TAG}:1h