Browse Source

update docker build

pull/290/head
yedf2 4 years ago
parent
commit
1f9239e7c9
  1. 21
      .github/workflows/release.yml
  2. 12
      helper/Dockerfile-release

21
.github/workflows/release.yml

@ -18,20 +18,25 @@ jobs:
- name: Check out code - name: Check out code
uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Setup node - name: Setup node
# uses: actions/setup-node@v3 uses: actions/setup-node@v3
# with: with:
# node-version: 14 node-version: 14
- name: Build admin
run: |
cd admin
npm install -g yarn
yarn
VITE_ADMIN_VERSION=${{ env.RELEASE_VERSION }} yarn build
cd ..
# - name: Build admin # - name: Scp admin
# env: # env:
# host: 'ubuntu@en.dtm.pub' # host: 'ubuntu@en.dtm.pub'
# dest: '/data/dtm-admin/' # dest: '/data/dtm-admin/'
# run: | # run: |
# cd admin # cd admin
# npm install -g yarn
# yarn
# VITE_ADMIN_VERSION=${{ env.RELEASE_VERSION }} yarn build
# echo "${{secrets.DEPLOY_KEY}}" > deploy_key # echo "${{secrets.DEPLOY_KEY}}" > deploy_key
# chmod 600 ./deploy_key # chmod 600 ./deploy_key
# tar -cvzf dist.tar.gz dist # tar -cvzf dist.tar.gz dist

12
helper/Dockerfile-release

@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM node:14.19-alpine as builder1 # FROM node:14.19-alpine as builder1
ARG RELEASE_VERSION # ARG RELEASE_VERSION
WORKDIR /app/dtm # WORKDIR /app/dtm
COPY . . # COPY . .
RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build # RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
FROM --platform=$TARGETPLATFORM golang:1.16-alpine as builder2 FROM --platform=$TARGETPLATFORM golang:1.16-alpine as builder2
ARG TARGETARCH ARG TARGETARCH
@ -13,7 +13,7 @@ WORKDIR /app/dtm
# RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct # RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct
EXPOSE 8080 EXPOSE 8080
COPY . . COPY . .
COPY --from=builder1 /app/dtm/admin/dist /app/dtm/admin # COPY --from=builder1 /app/dtm/admin/dist /app/dtm/admin
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w -X main.Version=$RELEASE_VERSION" RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w -X main.Version=$RELEASE_VERSION"
FROM --platform=$TARGETPLATFORM alpine FROM --platform=$TARGETPLATFORM alpine

Loading…
Cancel
Save