From 952c2a3f824d9057a75b8121d6bd8d11b8a53f85 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Thu, 30 Sep 2021 12:02:09 +0700 Subject: [PATCH] made build based on template --- .drone.yml | 8 +------- docker/www/Dockerfile | 7 +++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 41feb424..c4d6453b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,10 +2,4 @@ kind: template load: registry.yaml data: dockerfile: docker/www/Dockerfile - branches: - - master - - develop - when: - branch: - - master - - develop + diff --git a/docker/www/Dockerfile b/docker/www/Dockerfile index 9e9208f6..a910e3aa 100644 --- a/docker/www/Dockerfile +++ b/docker/www/Dockerfile @@ -1,13 +1,12 @@ -# stage1 as builder FROM node:dubnium-alpine as builder COPY package.json yarn.lock ./ -#RUN yarn +RUN yarn COPY . . -#RUN yarn build +RUN yarn build FROM nginx:alpine COPY docker/www/nginx.conf /etc/nginx/nginx.conf RUN rm -rf /usr/share/nginx/html/* -#COPY --from=builder /build /usr/share/nginx/html +COPY --from=builder /build /usr/share/nginx/html EXPOSE ${EXPOSE} 80 ENTRYPOINT ["nginx", "-g", "daemon off;"]