Skip to content

Commit ad697c6

Browse files
authored
fix: dockerfile build failed (#2918)
1 parent 3e09299 commit ad697c6

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

.github/workflows/deploy-with-docker.yml

-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ jobs:
4141
load: true
4242
tags: dashboard:ci
4343
context: .
44-
build-args: |
45-
APISIX_DASHBOARD_VERSION=master
4644
cache-from: |
4745
type=local,src=/tmp/.buildx-cache
4846
cache-to: |

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
#
1717
FROM alpine:latest as pre-build
1818

19-
ARG APISIX_DASHBOARD_VERSION=master
19+
COPY . /usr/local/apisix-dashboard
2020

2121
RUN set -x \
2222
&& apk add --no-cache --virtual .builddeps git \
23-
&& git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_VERSION} /usr/local/apisix-dashboard \
2423
&& cd /usr/local/apisix-dashboard && git clean -Xdf \
2524
&& rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash
2625

docs/en/latest/deploy-with-docker.md

-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ $ docker build -t apisix-dashboard:$tag .
4343
# For users in mainland China, the `ENABLE_PROXY` parameter can be provided to speed up module downloads.
4444
$ docker build -t apisix-dashboard:$tag . --build-arg ENABLE_PROXY=true
4545

46-
# If you want to use the latest codes to build, you can specify the `APISIX_DASHBOARD_VERSION` parameter to `master`.
47-
# This parameter can also be specified as branch name of a specific version, such as `v2.1.1`.
48-
$ docker build -t apisix-dashboard:$tag . --build-arg APISIX_DASHBOARD_VERSION=master
49-
```
50-
5146
## Launch
5247

5348
1. Preparing configuration files

web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@ant-design/pro-table": "2.30.8",
5757
"@antv/x6": "^1.18.5",
5858
"@antv/x6-react-components": "^1.1.7",
59-
"@monaco-editor/react": "^4.3.1",
59+
"@monaco-editor/react": "4.3.1",
6060
"@rjsf/antd": "2.2.0",
6161
"@rjsf/core": "2.2.0",
6262
"@types/js-yaml": "^4.0.0",

web/yarn.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -2048,13 +2048,13 @@
20482048
extend "3.0.2"
20492049

20502050
"@monaco-editor/loader@^1.2.0":
2051-
version "1.2.0"
2052-
resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.2.0.tgz#373fad69973384624e3d9b60eefd786461a76acd"
2053-
integrity sha512-cJVCG/T/KxXgzYnjKqyAgsKDbH9mGLjcXxN6AmwumBwa2rVFkwvGcUj1RJtD0ko4XqLqJxwqsN/Z/KURB5f1OQ==
2051+
version "1.4.0"
2052+
resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558"
2053+
integrity sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==
20542054
dependencies:
20552055
state-local "^1.0.6"
20562056

2057-
"@monaco-editor/react@^4.3.1":
2057+
"@monaco-editor/[email protected]":
20582058
version "4.3.1"
20592059
resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.3.1.tgz#d65bcbf174c39b6d4e7fec43d0cddda82b70a12a"
20602060
integrity sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg==
@@ -15734,8 +15734,8 @@ start-server-and-test@^1.11.5:
1573415734

1573515735
state-local@^1.0.6:
1573615736
version "1.0.7"
15737-
resolved "https://registry.npm.taobao.org/state-local/download/state-local-1.0.7.tgz#da50211d07f05748d53009bee46307a37db386d5"
15738-
integrity sha1-2lAhHQfwV0jVMAm+5GMHo32zhtU=
15737+
resolved "https://registry.yarnpkg.com/state-local/-/state-local-1.0.7.tgz#da50211d07f05748d53009bee46307a37db386d5"
15738+
integrity sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==
1573915739

1574015740
state-toggle@^1.0.0:
1574115741
version "1.0.3"

0 commit comments

Comments
 (0)