From daa137d05023fff2d93389cf82f64e27b0758d5c Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Fri, 13 Dec 2024 00:53:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BAaio?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-aio | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-aio b/Dockerfile-aio index bea74f2e..d4517c21 100644 --- a/Dockerfile-aio +++ b/Dockerfile-aio @@ -7,6 +7,7 @@ RUN CGO_ENABLED=0 go build -ldflags "-s -w -X 'main.version=${VERSION}'" -o pixi FROM node:16.18.0-alpine as builder WORKDIR /build +RUN apk add --no-cache git RUN git clone https://github.com/pixiu-io/dashboard.git RUN cd dashboard && npm install && npm run build From 1091a60d142a79585938123e5fbe6cf441d869b6 Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Fri, 13 Dec 2024 00:55:53 +0800 Subject: [PATCH 2/3] add --- .github/workflows/docker-image.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4e8603de..a2768c4c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -6,6 +6,10 @@ on: - "master" paths-ignore: - 'docs/**' + pull_request: + branches: + - master + jobs: build: From b1dc563706e25723503fec6f5e3f2d47db26d398 Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Fri, 13 Dec 2024 01:14:37 +0800 Subject: [PATCH 3/3] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a2768c4c..4e8603de 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -6,10 +6,6 @@ on: - "master" paths-ignore: - 'docs/**' - pull_request: - branches: - - master - jobs: build: