diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4865708773dfcd06591d2f82dbd1d1fce8ee0daa..545e3038389706988844b23fa2e4546692771199 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ build-back: stage: build artifacts image: golang:latest 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: paths: - ${CI_PROJECT_NAME}-linux-amd64 @@ -16,6 +16,9 @@ build-front: stage: build artifacts image: node:10-alpine script: + - apk update + - apk upgrade + - apk add --no-cache git - cd ./ui - npm install - npm run build diff --git a/Dockerfile b/Dockerfile index 18ffbdccd2b59aff0750867c5b521030e892792b..1ff6002cf4fee37f2998d19ee7fcc040a22de5f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ FROM golang:alpine AS build-back WORKDIR /app +RUN apk update && apk upgrade && apk add --no-cache git COPY . . 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 WORKDIR /app +RUN apk update && apk upgrade && apk add --no-cache git COPY ui/package*.json ./ RUN npm install COPY ui/ ./