diff --git a/.gitignore b/.gitignore index 0bffe7ddb..72d6c3015 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ /.nocalhost /.idea /bin -/dist harvester-network-controller diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 4f57d981a..a7d7acf61 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -15,7 +15,7 @@ RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.13.1/buildx ENV DAPPER_ENV REPO TAG DRONE_TAG ENV DAPPER_SOURCE /go/src/github.com/harvester/harvester-network-controller/ -ENV DAPPER_OUTPUT ./bin ./dist +ENV DAPPER_OUTPUT ./bin ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE} diff --git a/scripts/entry b/scripts/entry index 78fb56790..c58311c9e 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 ead54a524..2bea54b6a 100755 --- a/scripts/package +++ b/scripts/package @@ -14,11 +14,6 @@ if echo $TAG | grep -q dirty; then TAG=dev fi -mkdir -p dist/artifacts -cp bin/harvester-network-controller${SUFFIX} dist/artifacts/harvester-network-controller${SUFFIX} -cp bin/harvester-network-helper${SUFFIX} dist/artifacts/harvester-network-helper${SUFFIX} -cp bin/harvester-network-webhook${SUFFIX} dist/artifacts/harvester-network-webhook${SUFFIX} - CONTROLLER_IMAGE=${REPO}/harvester-network-controller:${TAG} HELPER_IMAGE=${REPO}/harvester-network-helper:${TAG} WEBHOOK_IMAGE=${REPO}/harvester-network-webhook:${TAG}