diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml index 222fd5d233..5568ed37f4 100644 --- a/.github/workflows/deploy-with-docker.yml +++ b/.github/workflows/deploy-with-docker.yml @@ -41,8 +41,6 @@ jobs: load: true tags: dashboard:ci context: . - build-args: | - APISIX_DASHBOARD_VERSION=master cache-from: | type=local,src=/tmp/.buildx-cache cache-to: | diff --git a/Dockerfile b/Dockerfile index f52d24a483..0aed27d616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,10 @@ # FROM alpine:latest as pre-build -ARG APISIX_DASHBOARD_VERSION=master +COPY . /usr/local/apisix-dashboard RUN set -x \ && apk add --no-cache --virtual .builddeps git \ - && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_VERSION} /usr/local/apisix-dashboard \ && cd /usr/local/apisix-dashboard && git clean -Xdf \ && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash diff --git a/docs/en/latest/deploy-with-docker.md b/docs/en/latest/deploy-with-docker.md index 551eedee28..9633b66a01 100644 --- a/docs/en/latest/deploy-with-docker.md +++ b/docs/en/latest/deploy-with-docker.md @@ -43,11 +43,6 @@ $ docker build -t apisix-dashboard:$tag . # For users in mainland China, the `ENABLE_PROXY` parameter can be provided to speed up module downloads. $ docker build -t apisix-dashboard:$tag . --build-arg ENABLE_PROXY=true -# If you want to use the latest codes to build, you can specify the `APISIX_DASHBOARD_VERSION` parameter to `master`. -# This parameter can also be specified as branch name of a specific version, such as `v2.1.1`. -$ docker build -t apisix-dashboard:$tag . --build-arg APISIX_DASHBOARD_VERSION=master -``` - ## Launch 1. Preparing configuration files diff --git a/web/package.json b/web/package.json index bd2b6f1216..86317ff630 100644 --- a/web/package.json +++ b/web/package.json @@ -56,7 +56,7 @@ "@ant-design/pro-table": "2.30.8", "@antv/x6": "^1.18.5", "@antv/x6-react-components": "^1.1.7", - "@monaco-editor/react": "^4.3.1", + "@monaco-editor/react": "4.3.1", "@rjsf/antd": "2.2.0", "@rjsf/core": "2.2.0", "@types/js-yaml": "^4.0.0", diff --git a/web/yarn.lock b/web/yarn.lock index 17069bfe08..fac7d03114 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -2048,13 +2048,13 @@ extend "3.0.2" "@monaco-editor/loader@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.2.0.tgz#373fad69973384624e3d9b60eefd786461a76acd" - integrity sha512-cJVCG/T/KxXgzYnjKqyAgsKDbH9mGLjcXxN6AmwumBwa2rVFkwvGcUj1RJtD0ko4XqLqJxwqsN/Z/KURB5f1OQ== + version "1.4.0" + resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558" + integrity sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg== dependencies: state-local "^1.0.6" -"@monaco-editor/react@^4.3.1": +"@monaco-editor/react@4.3.1": version "4.3.1" resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.3.1.tgz#d65bcbf174c39b6d4e7fec43d0cddda82b70a12a" integrity sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg== @@ -15734,8 +15734,8 @@ start-server-and-test@^1.11.5: state-local@^1.0.6: version "1.0.7" - resolved "https://registry.npm.taobao.org/state-local/download/state-local-1.0.7.tgz#da50211d07f05748d53009bee46307a37db386d5" - integrity sha1-2lAhHQfwV0jVMAm+5GMHo32zhtU= + resolved "https://registry.yarnpkg.com/state-local/-/state-local-1.0.7.tgz#da50211d07f05748d53009bee46307a37db386d5" + integrity sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w== state-toggle@^1.0.0: version "1.0.3"