diff --git a/build/images/cdn/Dockerfile b/build/images/cdn/Dockerfile index 23b764e5e47..c44540729ac 100644 --- a/build/images/cdn/Dockerfile +++ b/build/images/cdn/Dockerfile @@ -17,7 +17,7 @@ FROM nginx:1.19-alpine COPY --from=builder /go/src/d7y.io/dragonfly/v2/hack/start-cdn.sh /root/start.sh COPY --from=builder /go/src/d7y.io/dragonfly/v2/hack/cdn-nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /opt/dragonfly/df-cdn/cdn /opt/dragonfly/df-cdn/cdn +COPY --from=builder /opt/dragonfly/bin/cdn /opt/dragonfly/bin/cdn RUN echo "hosts: files dns" > /etc/nsswitch.conf diff --git a/deploy/kustomize/single-cluster-native/bases/cdn/statefulset.yaml b/deploy/kustomize/single-cluster-native/bases/cdn/statefulset.yaml index 38ae4052557..4b46590d4d4 100644 --- a/deploy/kustomize/single-cluster-native/bases/cdn/statefulset.yaml +++ b/deploy/kustomize/single-cluster-native/bases/cdn/statefulset.yaml @@ -72,7 +72,7 @@ spec: - | cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf nginx - exec /opt/dragonfly/df-cdn/cdn + exec /opt/dragonfly/bin/cdn image: dragonflyoss/cdn imagePullPolicy: "Always" ports: diff --git a/deploy/kustomize/single-cluster-openkruise/bases/cdn/statefulset.yaml b/deploy/kustomize/single-cluster-openkruise/bases/cdn/statefulset.yaml index 045ae150f69..4f43cdf88fa 100644 --- a/deploy/kustomize/single-cluster-openkruise/bases/cdn/statefulset.yaml +++ b/deploy/kustomize/single-cluster-openkruise/bases/cdn/statefulset.yaml @@ -74,7 +74,7 @@ spec: - | cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf nginx - exec /opt/dragonfly/df-cdn/cdn + exec /opt/dragonfly/bin/cdn image: dragonflyoss/cdn imagePullPolicy: "Always" ports: diff --git a/hack/env.sh b/hack/env.sh index 04494966ce0..34a136a254c 100644 --- a/hack/env.sh +++ b/hack/env.sh @@ -3,7 +3,6 @@ set -o errexit set -o pipefail export INSTALL_HOME=/opt/dragonfly -export INSTALL_CDN_PATH=df-cdn export INSTALL_BIN_PATH=bin export GO_SOURCE_EXCLUDES=( \ "test" \ diff --git a/hack/install.sh b/hack/install.sh index 5365faa82d7..82f76839a1e 100755 --- a/hack/install.sh +++ b/hack/install.sh @@ -32,7 +32,7 @@ install() { } install-cdn() { - local installCdnDir="${INSTALL_HOME}/${INSTALL_CDN_PATH}" + local installCdnDir="${INSTALL_HOME}/${INSTALL_BIN_PATH}" echo "install: ${installCdnDir}" createDir "${installCdnDir}" diff --git a/hack/start-cdn.sh b/hack/start-cdn.sh index 7d61c0abe65..ff4c5893bdb 100755 --- a/hack/start-cdn.sh +++ b/hack/start-cdn.sh @@ -6,4 +6,4 @@ set -o pipefail nginx -/opt/dragonfly/df-cdn/cdn "$@" +/opt/dragonfly/bin/cdn "$@"