Fix paths to server crate in scripts and gitignore

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-11-03 19:22:00 -07:00
parent 44e0a00734
commit a72bdac7df
4 changed files with 5 additions and 195550 deletions

4
.gitignore vendored
View file

@ -2,6 +2,6 @@
/zed.xcworkspace /zed.xcworkspace
.DS_Store .DS_Store
/script/node_modules /script/node_modules
/server/.env.toml /crates/server/.env.toml
/server/static/styles.css /crates/server/static/styles.css
/vendor/bin /vendor/bin

File diff suppressed because it is too large Load diff

View file

@ -7,4 +7,4 @@ cd ./script
if [[ $1 == --release ]]; then if [[ $1 == --release ]]; then
export NODE_ENV=production # Purge unused styles in --release mode export NODE_ENV=production # Purge unused styles in --release mode
fi fi
npx tailwindcss build ../server/styles.css --output ../server/static/styles.css npx tailwindcss build ../crates/server/styles.css --output ../crates/server/static/styles.css

View file

@ -16,7 +16,7 @@ if [[ $# < 1 ]]; then
fi fi
export ZED_KUBE_NAMESPACE=$1 export ZED_KUBE_NAMESPACE=$1
ENV_FILE="server/k8s/environments/${ZED_KUBE_NAMESPACE}.sh" ENV_FILE="crates/server/k8s/environments/${ZED_KUBE_NAMESPACE}.sh"
if [[ ! -f $ENV_FILE ]]; then if [[ ! -f $ENV_FILE ]]; then
echo "Invalid environment name '${ZED_KUBE_NAMESPACE}'" echo "Invalid environment name '${ZED_KUBE_NAMESPACE}'"
exit 1 exit 1
@ -34,4 +34,4 @@ export $(cat $ENV_FILE)
docker build . --tag "$ZED_IMAGE_ID" docker build . --tag "$ZED_IMAGE_ID"
docker push "$ZED_IMAGE_ID" docker push "$ZED_IMAGE_ID"
envsubst < server/k8s/manifest.template.yml | kubectl apply -f - envsubst < crates/server/k8s/manifest.template.yml | kubectl apply -f -