chore: unify binary directory (#828)

Signed-off-by: Jim Ma <majinjing3@gmail.com>
dragonflyoss · Jun 28, 2023 · 6bad029 · 6bad029
1 parent 4a99bdf
commit 6bad029
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,4 +6,4 @@ set -o pipefail
 
 nginx
 
-/opt/dragonfly/df-cdn/cdn "$@"
+/opt/dragonfly/bin/cdn "$@"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ set -o pipefail

		nginx

		/opt/dragonfly/df-cdn/cdn "$@"
		/opt/dragonfly/bin/cdn "$@"