From 07bee614bdc0dd5c61bf306e48914bdf10be6d0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 01:28:00 +0000 Subject: [PATCH 01/11] Bump the pip group across 2 directories with 2 updates Updates the requirements on [requests](https://github.com/psf/requests) and [urllib3](https://github.com/urllib3/urllib3) to permit the latest version. Updates `requests` to 2.32.3 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v0.2.0...v2.32.3) Updates `requests` from 2.31.0 to 2.32.2 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v0.2.0...v2.32.3) Updates `urllib3` from 1.26.18 to 1.26.19 - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/1.26.19/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.18...1.26.19) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production dependency-group: pip - dependency-name: requests dependency-type: direct:production dependency-group: pip - dependency-name: urllib3 dependency-type: direct:production dependency-group: pip ... Signed-off-by: dependabot[bot] <support@github.com> --- src/agent/kubernetes-agent/requirements.txt | 2 +- src/api-engine/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/agent/kubernetes-agent/requirements.txt b/src/agent/kubernetes-agent/requirements.txt index 7839fb75f..e98ba28a9 100644 --- a/src/agent/kubernetes-agent/requirements.txt +++ b/src/agent/kubernetes-agent/requirements.txt @@ -1,2 +1,2 @@ kubernetes<=9.0.0 -requests<=2.22.0 +requests<=2.32.3 diff --git a/src/api-engine/requirements.txt b/src/api-engine/requirements.txt index f8f6739c2..80b11ed61 100644 --- a/src/api-engine/requirements.txt +++ b/src/api-engine/requirements.txt @@ -41,7 +41,7 @@ python-dateutil==2.8.1 python3-openid==3.2.0 PyYAML==5.4 redis==4.4.4 -requests==2.31.0 +requests==2.32.2 requests-oauthlib==1.3.0 rfc3987==1.3.8 rsa==4.7 @@ -52,7 +52,7 @@ sqlparse==0.5.0 strict-rfc3339==0.7 swagger-spec-validator==2.5.0 uritemplate==3.0.1 -urllib3==1.26.18 +urllib3==1.26.19 uWSGI==2.0.22 validate-email==1.3 watchdog==0.10.2 From 3a07da857fd99db4c9dcb5efaf2c8983f212bc95 Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 10:21:33 +0800 Subject: [PATCH 02/11] upgrade node to 20 Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- build_image/docker/common/dashboard/Dockerfile.in | 4 ++-- build_image/docker/common/dashboard/nginx.conf | 2 ++ src/api-engine/api_engine/settings.py.example | 2 ++ src/dashboard/package.json | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build_image/docker/common/dashboard/Dockerfile.in b/build_image/docker/common/dashboard/Dockerfile.in index 0e81926e6..e9e9dabe1 100644 --- a/build_image/docker/common/dashboard/Dockerfile.in +++ b/build_image/docker/common/dashboard/Dockerfile.in @@ -1,10 +1,10 @@ -FROM node:14.18 +FROM node:20.15 WORKDIR /usr/src/app/ USER root RUN mkdir -p /usr/src/app && cd /usr/src/app COPY src/dashboard /usr/src/app -RUN yarn --network-timeout 600000 && yarn run build +RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn --network-timeout 600000 && yarn run build FROM nginx:1.15.12 COPY --from=0 /usr/src/app/dist /usr/share/nginx/html diff --git a/build_image/docker/common/dashboard/nginx.conf b/build_image/docker/common/dashboard/nginx.conf index 6a02c94e9..a8733c69a 100644 --- a/build_image/docker/common/dashboard/nginx.conf +++ b/build_image/docker/common/dashboard/nginx.conf @@ -28,6 +28,8 @@ http { #gzip on; + client_max_body_size 100M; + server { listen 8081; server_name localhost; diff --git a/src/api-engine/api_engine/settings.py.example b/src/api-engine/api_engine/settings.py.example index e978e34eb..1057218b5 100644 --- a/src/api-engine/api_engine/settings.py.example +++ b/src/api-engine/api_engine/settings.py.example @@ -240,3 +240,5 @@ SIMPLE_JWT = { 'TOKEN_TYPE_CLAIM': 'token_type', 'TOKEN_USER_CLASS': 'rest_framework_simplejwt.models.TokenUser', } + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/src/dashboard/package.json b/src/dashboard/package.json index b6fa1a1c7..2975af790 100755 --- a/src/dashboard/package.json +++ b/src/dashboard/package.json @@ -92,6 +92,7 @@ "@types/history": "^4.7.2", "@types/react": "^16.8.1", "@types/react-dom": "^16.0.11", + "glob": "^9.0.0", "@umijs/preset-react": "^1.2.2", "antd-pro-merge-less": "^1.0.0", "antd-theme-webpack-plugin": "^1.2.0", @@ -143,6 +144,7 @@ "scripts/**/*.js" ], "resolutions": { - "mockjs/commander": "^8.2.0" + "mockjs/commander": "^8.2.0", + "glob": "^9.0.0" } } From ebdde5989fe7133e8fb0b10ce36fb827a0a4323e Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 10:55:45 +0800 Subject: [PATCH 03/11] node20 for test/dashboard Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- tests/dashboard/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dashboard/docker-compose.yml b/tests/dashboard/docker-compose.yml index 6d2076929..1138ca12a 100644 --- a/tests/dashboard/docker-compose.yml +++ b/tests/dashboard/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: test-dashboard: - image: node:14.17 + image: node:20.15 volumes: - $ROOT_PATH/src/dashboard:/dashboard working_dir: /dashboard From e7e3f0f92324ad169a47369e27ff3c4ca57cf1bc Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 12:32:16 +0800 Subject: [PATCH 04/11] update all required images for HLF 2.5.9 Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- Makefile | 2 +- build_image/docker/cello-hlf/Dockerfile | 91 ++++++++++--------- .../docker/common/api-engine/Dockerfile.in | 9 +- 3 files changed, 53 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index 90597c223..88f221feb 100755 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ docker-rest-agent: docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH) fabric: - docker image pull yeasy/hyperledger-fabric:2.2.0 + docker build -t hyperledger/fabric:2.5.9 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/ dashboard: docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./ diff --git a/build_image/docker/cello-hlf/Dockerfile b/build_image/docker/cello-hlf/Dockerfile index 2720f704d..4b2637bc1 100644 --- a/build_image/docker/cello-hlf/Dockerfile +++ b/build_image/docker/cello-hlf/Dockerfile @@ -1,12 +1,16 @@ # https://github.com/yeasy/docker-hyperledger-fabric # # Dockerfile for Hyperledger fabric all-in-one development and experiments, including: -# * fabric-peer # * fabric-orderer +# * fabric-peer # * fabric-ca -# * cryptogen # * configtxgen # * configtxlator +# * cryptogen +# * discover +# * ledgerutil +# * osnadmin +# * ccaas_builder sample # * gotools # If you only need quickly deploy a fabric network, please see @@ -17,8 +21,8 @@ # Workdir is set to $GOPATH/src/github.com/hyperledger/fabric # Data is stored under /var/hyperledger/production -FROM golang:1.14 -LABEL version=2.2.0 +FROM golang:1.22 +LABEL maintainer "Baohua Yang <yeasy.github.com>" # Orderer, peer, ca, operation api EXPOSE 7050 7051 7054 8443 9443 @@ -30,15 +34,15 @@ ENV FABRIC_ROOT=$GOPATH/src/github.com/hyperledger/fabric \ FABRIC_CA_ROOT=$GOPATH/src/github.com/hyperledger/fabric-ca # BASE_VERSION is used in metadata.Version as major version -ENV BASE_VERSION=2.2.0 +ENV BASE_VERSION=2.5.9 # PROJECT_VERSION is required in core.yaml for fabric-baseos and fabric-ccenv -ENV PROJECT_VERSION=2.2.0 -ENV HLF_CA_VERSION=1.4.8 +ENV PROJECT_VERSION=2.5.9 +ENV HLF_CA_VERSION=1.5.12 # generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node ENV DOCKER_NS=hyperledger -ENV TWO_DIGIT_VERSION=2.2 +ENV TWO_DIGIT_VERSION=2.5 ENV BASE_DOCKER_NS=hyperledger ENV LD_FLAGS="-X github.com/hyperledger/fabric/common/metadata.Version=${PROJECT_VERSION} \ @@ -69,39 +73,38 @@ ENV FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server \ RUN mkdir -p /var/hyperledger/production \ $GOPATH/src/github.com/hyperledger \ - $FABRIC_CFG_PATH \ + /opt/hyperledger/ccaas_builder/bin \ $FABRIC_CFG_PATH/crypto-config \ + /var/hyperledger/fabric-ca-server \ $FABRIC_CA_SERVER_HOME \ $FABRIC_CA_CLIENT_HOME \ $CA_CFG_PATH \ /chaincode/input \ - /chaincode/output \ - /var/hyperledger/fabric-ca-server + /chaincode/output # Install development dependencies RUN apt-get update \ - && apt-get install -y apt-utils python3-dev docker-compose-plugin\ + && apt-get install -y apt-utils python3-dev \ && apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev libyaml-dev libltdl-dev libtool \ - && apt-get install -y python3-pip \ && apt-get install -y vim tree jq unzip \ - && pip3 install behave nose \ - && pip3 install pyinotify \ + && apt-get install -y python3 python3-pip python3-venv \ + && python3 -m venv /opt/venv \ + && /opt/venv/bin/pip install behave nose PyYAML==5.3.1 docker-compose pyinotify \ && rm -rf /var/cache/apt +ENV PATH="/opt/venv/bin:$PATH" + # Install yq to update config for fabric-ca RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/2.4.1/yq_linux_amd64 \ && chmod a+x /go/bin/yq -# install gotools -RUN go get github.com/golang/protobuf/protoc-gen-go \ - && go get github.com/maxbrunsfeld/counterfeiter \ - && go get github.com/axw/gocov/... \ - && go get github.com/AlekSi/gocov-xml \ - && go get golang.org/x/tools/cmd/goimports \ - && go get golang.org/x/lint/golint \ - && go get github.com/estesp/manifest-tool/... \ - && go get github.com/client9/misspell/cmd/misspell \ - && go get github.com/onsi/ginkgo/ginkgo +# Install gotools +RUN go install github.com/golang/protobuf/protoc-gen-go@latest \ + && go install github.com/maxbrunsfeld/counterfeiter/v6@latest \ + && go install github.com/axw/gocov/gocov@latest \ + && go install github.com/axw/gocov/gocov@latest \ + && go install golang.org/x/tools/cmd/goimports@latest \ + && go install github.com/onsi/ginkgo/ginkgo@latest # Clone the Hyperledger Fabric code and cp sample config files RUN cd $GOPATH/src/github.com/hyperledger \ @@ -114,25 +117,27 @@ RUN cd $GOPATH/src/github.com/hyperledger \ && cp -r $FABRIC_ROOT/sampleconfig/* $FABRIC_CFG_PATH/ # Add external fabric chaincode dependencies -RUN go get github.com/hyperledger/fabric-chaincode-go/shim \ - && go get github.com/hyperledger/fabric-protos-go/peer - -# Install configtxgen, cryptogen, configtxlator, discover and idemixgen -RUN cd $FABRIC_ROOT/ \ - && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/configtxgen \ - && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/cryptogen \ - && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/configtxlator \ - && CGO_CFLAGS=" " go install -tags "" -ldflags "-X github.com/hyperledger/fabric/cmd/discover/metadata.Version=${PROJECT_VERSION}" github.com/hyperledger/fabric/cmd/discover \ - && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/idemixgen - -# Install fabric peer -RUN CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/peer \ - && go clean - -# Install fabric orderer -RUN CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/orderer \ +#RUN go get github.com/hyperledger/fabric-chaincode-go/shim \ +# && go get github.com/hyperledger/fabric-protos-go/peer + +# Install configtxgen, cryptogen, configtxlator, discover, ledgerutil, osnadmin, orderer and peer +RUN cd $FABRIC_ROOT \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/configtxgen \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/configtxlator \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/cryptogen \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/discover \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/ledgerutil \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/osnadmin \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/orderer \ + && CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/peer \ && go clean +# Install ccaas_builder sample, since hlf v2.4.1 +RUN cd $FABRIC_ROOT/ccaas_builder \ + && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/build \ + && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/detect \ + && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/release \ + && go clean #ADD crypto-config $FABRIC_CFG_PATH/crypto-config # Install fabric-ca @@ -142,7 +147,7 @@ RUN cd $GOPATH/src/github.com/hyperledger \ && rm v${HLF_CA_VERSION}.zip \ && mv fabric-ca-${HLF_CA_VERSION} fabric-ca \ # This will install fabric-ca-server and fabric-ca-client into $GOPATH/bin/ - && go install -ldflags "-X github.com/hyperledger/fabric-ca/lib/metadata.Version=$PROJECT_VERSION -linkmode external -extldflags '-static -lpthread'" github.com/hyperledger/fabric-ca/cmd/... \ + && go install -ldflags "-X github.com/hyperledger/fabric-ca/lib/metadata.Version=${HLF_CA_VERSION} -linkmode external -extldflags '-static -lpthread'" github.com/hyperledger/fabric-ca/cmd/... \ # Copy example ca and key files #&& cp $FABRIC_CA_ROOT/images/fabric-ca/payload/*.pem $FABRIC_CA_HOME/ \ && go clean diff --git a/build_image/docker/common/api-engine/Dockerfile.in b/build_image/docker/common/api-engine/Dockerfile.in index 347b729f8..19b3a27aa 100644 --- a/build_image/docker/common/api-engine/Dockerfile.in +++ b/build_image/docker/common/api-engine/Dockerfile.in @@ -2,7 +2,7 @@ FROM python:3.8 # Install software RUN apt-get update \ - && apt-get install -y gettext-base graphviz libgraphviz-dev \ + && apt-get install -y gettext-base graphviz libgraphviz-dev vim \ && apt-get autoclean \ && apt-get clean \ && apt-get autoremove && rm -rf /var/cache/apt/ @@ -10,14 +10,13 @@ RUN apt-get update \ # Set the working dir WORKDIR /var/www/server +# Install compiled code tools from Artifactory and copy it to opt folder. +RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.9/hyperledger-fabric-linux-amd64-2.5.9.tar.gz" | tar xz -C /opt/ + # Copy source code to the working dir COPY src/api-engine ./ COPY template/node /opt/node -# Install compiled code tools from Artifactory and copy it to opt folder. -RUN curl "https://hyperledger.jfrog.io/artifactory/fabric-binaries/hyperledger-fabric-linux-amd64-2.2-stable.tar.gz?archiveType=gzip" > bin.tar.gz \ - && tar -xzvf bin.tar.gz -C /opt/ - # Install python dependencies RUN pip3 install -r requirements.txt From 204140918a551d4994c452066b77fa7dd0e776a3 Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 12:42:08 +0800 Subject: [PATCH 05/11] upgrade glob9.0.0 for dashboard Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- src/dashboard/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dashboard/package.json b/src/dashboard/package.json index b6fa1a1c7..2975af790 100755 --- a/src/dashboard/package.json +++ b/src/dashboard/package.json @@ -92,6 +92,7 @@ "@types/history": "^4.7.2", "@types/react": "^16.8.1", "@types/react-dom": "^16.0.11", + "glob": "^9.0.0", "@umijs/preset-react": "^1.2.2", "antd-pro-merge-less": "^1.0.0", "antd-theme-webpack-plugin": "^1.2.0", @@ -143,6 +144,7 @@ "scripts/**/*.js" ], "resolutions": { - "mockjs/commander": "^8.2.0" + "mockjs/commander": "^8.2.0", + "glob": "^9.0.0" } } From 1ab109a89287b7d31412c27ff8f9cc0d2e36975f Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 12:47:18 +0800 Subject: [PATCH 06/11] upgrade node16 Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- build_image/docker/common/dashboard/Dockerfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_image/docker/common/dashboard/Dockerfile.in b/build_image/docker/common/dashboard/Dockerfile.in index 0e81926e6..689af7d26 100644 --- a/build_image/docker/common/dashboard/Dockerfile.in +++ b/build_image/docker/common/dashboard/Dockerfile.in @@ -1,4 +1,4 @@ -FROM node:14.18 +FROM node:16.20 WORKDIR /usr/src/app/ USER root From e7b86fac19492ed1534d1443cb5ce0d981dad012 Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 13:01:05 +0800 Subject: [PATCH 07/11] upgrade node20 in dockerfile/dashboard Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- build_image/docker/common/dashboard/Dockerfile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_image/docker/common/dashboard/Dockerfile.in b/build_image/docker/common/dashboard/Dockerfile.in index 689af7d26..e9e9dabe1 100644 --- a/build_image/docker/common/dashboard/Dockerfile.in +++ b/build_image/docker/common/dashboard/Dockerfile.in @@ -1,10 +1,10 @@ -FROM node:16.20 +FROM node:20.15 WORKDIR /usr/src/app/ USER root RUN mkdir -p /usr/src/app && cd /usr/src/app COPY src/dashboard /usr/src/app -RUN yarn --network-timeout 600000 && yarn run build +RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn --network-timeout 600000 && yarn run build FROM nginx:1.15.12 COPY --from=0 /usr/src/app/dist /usr/share/nginx/html From 51eda8159aca32b3f19b8472f14c525edf537ada Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 13:29:00 +0800 Subject: [PATCH 08/11] modify node to 14 in test/dashboard Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- tests/dashboard/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dashboard/docker-compose.yml b/tests/dashboard/docker-compose.yml index 1138ca12a..4d3f59f20 100644 --- a/tests/dashboard/docker-compose.yml +++ b/tests/dashboard/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: test-dashboard: - image: node:20.15 + image: node:14.18 volumes: - $ROOT_PATH/src/dashboard:/dashboard working_dir: /dashboard From f06c737812e60488395a5f3b9cdcbea27fdbd9d4 Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Fri, 23 Aug 2024 18:27:52 +0800 Subject: [PATCH 09/11] modify netlify-lamda to netlify-cli Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- src/dashboard/package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dashboard/package.json b/src/dashboard/package.json index 2975af790..1ea4e4de0 100755 --- a/src/dashboard/package.json +++ b/src/dashboard/package.json @@ -13,7 +13,7 @@ "docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up", "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro", "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro", - "functions:build": "npm run generateMock && netlify-lambda build ./lambda", + "functions:build": "yarn run generateMock && netlify build ./lambda", "functions:run": "npm run generateMock && cross-env NODE_ENV=dev netlify-lambda serve ./lambda", "generateMock": "node ./scripts/generateMock", "lint": "eslint --ext .js src mock tests && npm run lint:style && npm run lint:prettier", @@ -23,7 +23,7 @@ "lint:prettier": "check-prettier lint", "lint:style": "stylelint 'src/**/*.less' --syntax less", "prettier": "node ./scripts/prettier.js", - "site": "umi build && npm run functions:build", + "site": "umi build && yarn run functions:build", "start": "cross-env umi dev PORT=8001", "start:no-mock": "cross-env MOCK=none umi dev PORT=8002", "test": "umi test", @@ -66,7 +66,7 @@ "lodash-decorators": "^6.0.1", "memoize-one": "^5.0.0", "moment": "^2.24.0", - "netlify-lambda": "^1.4.3", + "merge-umi-mock-data": "^2.0.0", "numeral": "^2.0.6", "nzh": "^1.0.4", "omit.js": "^1.0.0", @@ -119,6 +119,7 @@ "less": "^3.9.0", "lint-staged": "^11.0.0", "mockjs": "^1.0.1-beta3", + "netlify-cli": "^16.0.0", "prettier": "^1.17.0", "serverless-http": "^2.0.1", "slash2": "^2.0.0", From fef5f1c23320cc6130c8d980570dd77d517b7c2b Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Sat, 24 Aug 2024 01:19:37 +0800 Subject: [PATCH 10/11] make netlify-cli run but got bug on how to use serverless function Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- .gitignore | 6 +++++- src/dashboard/package.json | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b8320d1d1..b4eb03b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -247,4 +247,8 @@ src/dashboard/lambda/mock/index.js # Cello local storage /**/opt/* -/**/cello/* \ No newline at end of file +/**/cello/* + +# Local Netlify folder +.netlify +src/dashboard/deno.lock diff --git a/src/dashboard/package.json b/src/dashboard/package.json index 1ea4e4de0..ed96bd4ca 100755 --- a/src/dashboard/package.json +++ b/src/dashboard/package.json @@ -13,8 +13,8 @@ "docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up", "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro", "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro", - "functions:build": "yarn run generateMock && netlify build ./lambda", - "functions:run": "npm run generateMock && cross-env NODE_ENV=dev netlify-lambda serve ./lambda", + "functions:build": "yarn run generateMock && netlify dev", + "netlify:dev": "netlify dev", "generateMock": "node ./scripts/generateMock", "lint": "eslint --ext .js src mock tests && npm run lint:style && npm run lint:prettier", "lint-staged": "lint-staged", @@ -57,6 +57,7 @@ "antd": "^4.2.5", "bizcharts": "3.5.2-beta.1", "bizcharts-plugin-slider": "^2.1.1-beta.1", + "body-parser": "^1.19.0", "cello-paginator": "^1.0.1", "classnames": "^2.2.6", "enquire-js": "^0.2.1", @@ -66,7 +67,7 @@ "lodash-decorators": "^6.0.1", "memoize-one": "^5.0.0", "moment": "^2.24.0", - "merge-umi-mock-data": "^2.0.0", + "merge-umi-mock-data": "^1.0.0", "numeral": "^2.0.6", "nzh": "^1.0.4", "omit.js": "^1.0.0", From 16ef05526e72b53ceecc69ebc5dc51338d9c9949 Mon Sep 17 00:00:00 2001 From: YoungHypo <haiboyang@smail.nju.edu.cn> Date: Sat, 24 Aug 2024 08:29:18 +0800 Subject: [PATCH 11/11] redirect the path in netlify.toml Signed-off-by: YoungHypo <haiboyang@smail.nju.edu.cn> --- .gitignore | 2 +- src/dashboard/netlify.toml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/dashboard/netlify.toml diff --git a/.gitignore b/.gitignore index b4eb03b1f..d870dfec1 100644 --- a/.gitignore +++ b/.gitignore @@ -251,4 +251,4 @@ src/dashboard/lambda/mock/index.js # Local Netlify folder .netlify -src/dashboard/deno.lock +deno.lock diff --git a/src/dashboard/netlify.toml b/src/dashboard/netlify.toml new file mode 100644 index 000000000..d02adefce --- /dev/null +++ b/src/dashboard/netlify.toml @@ -0,0 +1,8 @@ +[build] +functions = "lambda" + +[[redirects]] + from = "/*" + to = "/.netlify/functions/:splat" + status = 200 +