6543/wg-gen-web
0
0
Fork 0
mirror of https://github.com/vx3r/wg-gen-web.git synced 2024-11-04 17:31:17 +00:00
Code Issues Releases Wiki Activity

add version in back and front #16 / client can ignore global PK #17 / #18 email is now optional

Browse Source
This commit is contained in:
vx3r 2020-02-25 16:19:00 +09:00
parent 1a35c22d59
commit a98c39ad04
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -7,7 +7,7 @@ build-back:
stage: build artifacts stage: build artifacts
image: golang:latest image: golang:latest
script: script:
- GOOS=linux GOARCH=amd64 go build -o ${CI_PROJECT_NAME}-linux-amd64 - GOOS=linux GOARCH=amd64 go build -ldflags "-X main.VersionGitCommit=${CI_COMMIT_SHORT_SHA}" -o ${CI_PROJECT_NAME}-linux-amd64
artifacts: artifacts:
paths: paths:
- ${CI_PROJECT_NAME}-linux-amd64 - ${CI_PROJECT_NAME}-linux-amd64
@ -16,6 +16,9 @@ build-front:
stage: build artifacts stage: build artifacts
image: node:10-alpine image: node:10-alpine
script: script:
- apk update
- apk upgrade
- apk add --no-cache git
- cd ./ui - cd ./ui
- npm install - npm install
- npm run build - npm run build

2
Dockerfile
View File

@ -1,10 +1,12 @@
FROM golang:alpine AS build-back FROM golang:alpine AS build-back
WORKDIR /app WORKDIR /app
RUN apk update && apk upgrade && apk add --no-cache git
COPY . . COPY . .
RUN GIT_COMMIT=$(git rev-parse --short HEAD) && go build -ldflags "-X main.VersionGitCommit=$GIT_COMMIT" go build -o wg-gen-web-linux RUN GIT_COMMIT=$(git rev-parse --short HEAD) && go build -ldflags "-X main.VersionGitCommit=$GIT_COMMIT" go build -o wg-gen-web-linux


FROM node:10-alpine AS build-front FROM node:10-alpine AS build-front
WORKDIR /app WORKDIR /app
RUN apk update && apk upgrade && apk add --no-cache git
COPY ui/package*.json ./ COPY ui/package*.json ./
RUN npm install RUN npm install
COPY ui/ ./ COPY ui/ ./