github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmui: actualize Dockerfiles

Browse source
This commit is contained in:
Aliaksandr Valialkin 2021-08-11 12:59:05 +03:00
parent 81e4d644dd
commit 860b272a95
5 changed files with 21110 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/vmui/packages/vmui/Docker-build → app/vmui/Dockerfile-build
View file

@ -1,4 +1,4 @@
FROM node:14-alpine3.12 as build-stage
FROM node:alpine3.14
RUN apk update && apk add --no-cache bash bash-doc bash-completion libtool autoconf automake nasm pkgconfig libpng gcc make g++ zlib-dev gawk

4
app/vmui/packages/vmui/Dockerfile-web → app/vmui/Dockerfile-web
View file

@ -1,4 +1,4 @@
FROM golang:1.16.2 as build-web-stage
FROM golang:1.16.7 as build-web-stage
COPY build /build
WORKDIR /build
@ -6,7 +6,7 @@ COPY web/ /build/
RUN GOOS=linux GOARCH=amd64 GO111MODULE=on CGO_ENABLED=0 go build -o web-amd64 github.com/VictoriMetrics/vmui/ && \
GOOS=windows GOARCH=amd64 GO111MODULE=on CGO_ENABLED=0 go build -o web-windows github.com/VictoriMetrics/vmui/
FROM alpine:3.13.2
FROM alpine:3.14.1
USER root
COPY --from=build-web-stage /build/web-amd64 /app/web

5
app/vmui/Makefile
View file

@ -1,8 +1,7 @@
# All these commands must run from repository root.
vmui-package-base-image:
(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q vmui-builder-image) \
|| docker build -t vmui-builder-image -f app/vmui/packages/vmui/Docker-build ./app/vmui
docker build -t vmui-builder-image -f app/vmui/Dockerfile-build ./app/vmui
vmui-build: vmui-package-base-image
docker run --rm \
@ -13,7 +12,7 @@ vmui-build: vmui-package-base-image
vmui-builder-image -c "npm install && npm run build"
vmui-release: vmui-build
docker build -t ${DOCKER_NAMESPACE}/vmui:latest -f app/vmui/packages/vmui/Dockerfile-web ./app/vmui/packages/vmui
docker build -t ${DOCKER_NAMESPACE}/vmui:latest -f app/vmui/Dockerfile-web ./app/vmui/packages/vmui
docker tag ${DOCKER_NAMESPACE}/vmui:latest ${DOCKER_NAMESPACE}/vmui:${PKG_TAG}
vmui-publish-latest: vmui-release

19
app/vmui/packages/vmui/Dockerfile
View file

@ -1,19 +0,0 @@
FROM node:14-alpine3.12 as build-stage
RUN apk update && apk add --no-cache bash bash-doc bash-completion libtool autoconf automake nasm pkgconfig libpng gcc make g++ zlib-dev gawk
RUN mkdir -p /app
WORKDIR /app
COPY ./package.json /app/package.json
COPY ./package-lock.json /app/package-lock.json
RUN cd /app && npm install
COPY . /app
RUN npm run build
FROM nginx:latest as production-stage
COPY --from=build-stage /app/build /usr/share/nginx/html
COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
COPY ./nginx/default /etc/nginx/sites-enabled/default
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

21129
app/vmui/packages/vmui/package-lock.json generated
View file

File diff suppressed because it is too large Load diff