Skip to content

Commit

Permalink
fix: ci lint
Browse files Browse the repository at this point in the history
  • Loading branch information
zll600 committed Jan 31, 2024
1 parent 9ee98e2 commit 58141bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/deploy-with-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -74,4 +71,4 @@ jobs:
docker logs docker-deploy_managerapi_1
- name: Run Test
run: api/test/shell/manager_smoking.sh -s false
run: api/test/shell/manager_smoking.sh -s false
9 changes: 1 addition & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 58141bb

Please sign in to comment.