Skip to content

Commit

Permalink
fix: dockerfile build failed (#2918)
Browse files Browse the repository at this point in the history
  • Loading branch information
zll600 authored Feb 1, 2024
1 parent 3e09299 commit ad697c6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deploy-with-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions docs/en/latest/deploy-with-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]":
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==
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit ad697c6

Please sign in to comment.