diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml index 123d96409..129f44a42 100644 --- a/.github/workflows/deploy-with-docker.yml +++ b/.github/workflows/deploy-with-docker.yml @@ -40,9 +40,6 @@ jobs: with: load: true tags: dashboard:ci - context: . - build-args: | - APISIX_DASHBOARD_VERSION=master cache-from: | type=local,src=/tmp/.buildx-cache cache-to: | @@ -74,4 +71,4 @@ jobs: docker logs docker-deploy_managerapi_1 - name: Run Test - run: api/test/shell/manager_smoking.sh -s false \ No newline at end of file + run: api/test/shell/manager_smoking.sh -s false diff --git a/Dockerfile b/Dockerfile index b5e173e3e..dfdc4da10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,13 +18,8 @@ FROM alpine:latest as pre-build ARG APISIX_DASHBOARD_VERSION=master -ARG STOP=1 -RUN set -x \ - && apk add --no-cache --virtual .builddeps git \ - && git clone https://github.com/zll600/apisix-dashboard.git -b fix_taobao_link /usr/local/apisix-dashboard \ - && cd /usr/local/apisix-dashboard && git clean -Xdf \ - && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash +COPY . /usr/local/apisix-dashboard FROM golang:1.19 as api-builder @@ -41,7 +36,6 @@ RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.io, FROM node:16-alpine as fe-builder ARG ENABLE_PROXY=false -ARG STOP=1 WORKDIR /usr/local/apisix-dashboard @@ -54,7 +48,6 @@ RUN if [ "$ENABLE_PROXY" = "true" ] ; then yarn config set registry https://regi && yarn build FROM alpine:latest as prod -ARG STOP=1 ARG ENABLE_PROXY=false