dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: unify binary directory (#828) 

Signed-off-by: Jim Ma <majinjing3@gmail.com>
This commit is contained in:
Jim Ma 2021-11-25 12:54:52 +08:00 committed by Gaius
parent 4a99bdfe4b
commit 6bad029d81
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/images/cdn/Dockerfile
View File

@ -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/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 /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 RUN echo "hosts: files dns" > /etc/nsswitch.conf

2
deploy/kustomize/single-cluster-native/bases/cdn/statefulset.yaml
View File

@ -72,7 +72,7 @@ spec:
- | - |
cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf
nginx nginx
exec /opt/dragonfly/df-cdn/cdn exec /opt/dragonfly/bin/cdn
image: dragonflyoss/cdn image: dragonflyoss/cdn
imagePullPolicy: "Always" imagePullPolicy: "Always"
ports: ports:

2
deploy/kustomize/single-cluster-openkruise/bases/cdn/statefulset.yaml
View File

@ -74,7 +74,7 @@ spec:
- | - |
cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf cp /etc/dragonfly/nginx.conf /etc/nginx/nginx.conf
nginx nginx
exec /opt/dragonfly/df-cdn/cdn exec /opt/dragonfly/bin/cdn
image: dragonflyoss/cdn image: dragonflyoss/cdn
imagePullPolicy: "Always" imagePullPolicy: "Always"
ports: ports:

1
hack/env.sh
View File

@ -3,7 +3,6 @@ set -o errexit
set -o pipefail set -o pipefail
export INSTALL_HOME=/opt/dragonfly export INSTALL_HOME=/opt/dragonfly
export INSTALL_CDN_PATH=df-cdn
export INSTALL_BIN_PATH=bin export INSTALL_BIN_PATH=bin
export GO_SOURCE_EXCLUDES=( \ export GO_SOURCE_EXCLUDES=( \
"test" \ "test" \

2
hack/install.sh
View File

@ -32,7 +32,7 @@ install() {
} }
install-cdn() { install-cdn() {
local installCdnDir="${INSTALL_HOME}/${INSTALL_CDN_PATH}" local installCdnDir="${INSTALL_HOME}/${INSTALL_BIN_PATH}"
echo "install: ${installCdnDir}" echo "install: ${installCdnDir}"
createDir "${installCdnDir}" createDir "${installCdnDir}"

2
hack/start-cdn.sh
View File

@ -6,4 +6,4 @@ set -o pipefail
nginx nginx
/opt/dragonfly/df-cdn/cdn "$@" /opt/dragonfly/bin/cdn "$@"