Skip to content

Commit

Permalink
Merge pull request #441 from desci-labs/m0ar/new-resolver-and-publish
Browse files Browse the repository at this point in the history
Fixes for new resolver & publish
  • Loading branch information
m0ar authored Aug 19, 2024
2 parents 27084d7 + cb661e3 commit 882d35d
Show file tree
Hide file tree
Showing 52 changed files with 36,440 additions and 294 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ jobs:
desci-server/yarn.lock
desci-repo/yarn.lock
- name: Set up docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
sudo docker-compose --version
docker info
- name: Install dependencies
run: cd desci-models && npm i -g yarn && yarn && yarn build && cd ../desci-server && yarn --ignore-engines && cd ../desci-repo && yarn

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/build-repo-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ jobs:
# with:
# node-version: 16

# - name: Set up docker-compose
# run: |
# sudo curl -L "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
# sudo docker-compose --version
# docker info

# - name: Install dependencies
# run: cd desci-repo && yarn

Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/build-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ jobs:
desci-models/yarn.lock
desci-server/yarn.lock
- name: Set up docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
sudo docker-compose --version
docker info
- name: Install dependencies
run: cd desci-models && npm i -g yarn && yarn && yarn build && cd ../desci-server && yarn --ignore-engines

Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/models-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ jobs:
cache: "yarn"
cache-dependency-path: "desci-models/yarn.lock"

- name: Set up docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
sudo docker-compose --version
docker info
- name: Install dependencies
run: cd desci-models && npm i -g yarn && yarn && yarn build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ The following guide is meant to get you running for full-stack dev on your local
Make sure you have these packages installed on your system:

- Docker
- docker-compose
- docker compose (comes with Docker Desktop, otherwise install the plugin package for your OS)
- lsof (may not be available by default depending on OS)

<br>
Expand Down
2 changes: 1 addition & 1 deletion bootstrapCeramic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ echo "$CTX Deployment all good, probably!"

if [ "$WAS_RUNNING" -eq "0" ]; then
echo "$CTX Shutting down ceramic service..."
docker compose --project-name desci down
docker compose --project-name desci stop
else
echo "$CTX Leaving compose services up as they were already running when we started."
fi
Expand Down
1 change: 1 addition & 0 deletions ceramic-k8s/ceramic_deployment_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ spec:
{{- with secret "secrets/desci-server/dev/db" -}}
echo "{\"anchor\":{\"ethereum-rpc-url\":\"{{ .Data.ceramic_rpc }}\"},\"http-api\":{\"cors-allowed-origins\":[\".*\"],\"admin-dids\":[\"did:key:z6MktbKJrMnhVJ37QFTo12911ycm2juKDUzWHDVETu9s5a9T\"]},\"ipfs\":{\"mode\":\"remote\",\"host\":\"http://public-ceramic-ipfs-dev-service-internal.default.svc.cluster.local:5001\"},\"logger\":{\"log-level\":0},\"metrics\":{\"metrics-exporter-enabled\":false,\"metrics-port\":9090},\"network\":{\"name\":\"testnet-clay\"},\"node\":{},\"state-store\":{\"mode\":\"fs\",\"local-directory\":\"/root/.ceramic/statestore\"},\"indexing\":{\"db\":\"{{ .Data.ceramic_url }}\",\"allow-queries-before-historical-sync\":true,\"models\":[]}}" > daemon.config.json
export NODE_ENV=production
export CERAMIC_PUBSUB_QPS_LIMIT=500
echo "envset";
{{- end -}}
labels:
Expand Down
1 change: 1 addition & 0 deletions ceramic-k8s/ceramic_deployment_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ spec:
{{- with secret "secrets/desci-server/production/db" -}}
echo "{\"anchor\":{\"auth-method\":\"did\",\"ethereum-rpc-url\":\"{{ .Data.ceramic_rpc }}\"},\"node\":{\"privateSeedUrl\":\"inplace:ed25519#{{ .Data.ceramic_cas_pkey }}\"},\"http-api\":{\"cors-allowed-origins\":[\".*\"],\"admin-dids\":[\"did:key:z6MktbKJrMnhVJ37QFTo12911ycm2juKDUzWHDVETu9s5a9T\"]},\"ipfs\":{\"mode\":\"remote\",\"host\":\"http://public-ceramic-ipfs-prod-service-internal.default.svc.cluster.local:5001\"},\"logger\":{\"log-level\":0},\"metrics\":{\"metrics-exporter-enabled\":false,\"metrics-port\":9090},\"network\":{\"name\":\"mainnet\"},\"state-store\":{\"mode\":\"fs\",\"local-directory\":\"/root/.ceramic/statestore\"},\"indexing\":{\"db\":\"{{ .Data.ceramic_url }}\",\"allow-queries-before-historical-sync\":true,\"models\":[]}}" > daemon.config.json
export NODE_ENV=production
export CERAMIC_PUBSUB_QPS_LIMIT=500
echo "envset";
{{- end -}}
labels:
Expand Down
Loading

0 comments on commit 882d35d

Please sign in to comment.