From b2d94f337fa6d34e7bfbb7b0a60b2acb25e039c6 Mon Sep 17 00:00:00 2001 From: Jacob Salvi Date: Tue, 17 Mar 2020 14:44:05 +0100 Subject: [PATCH] Hopefully maybe it will conisder to work @tommi27,Claudio told me to do so --- .gitlab-ci.yml | 24 ++++++++++++++++++++++-- Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a033693..cad8f7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: node:latest stages: - build - test + - deploy cache: paths: @@ -19,6 +20,25 @@ install_dependencies: testing_testing: stage: test - script: + script: - cd smart-hut - - yarn test \ No newline at end of file + - yarn test + +smartHut_deploy: + stage: deploy + # tags: + # - dind + image: docker:latest + services: + - docker:dind + variables: + DOCKER_DRIVER: overlay + before_script: + - docker version + - docker info + - docker login -u smarthutsm -p $CI_DOCKER_PASS #GiovanniRoberto + script: + - "docker build -t smarthutsm/smarthut:${CI_COMMIT_BRANCH} ." + - "docker push smarthutsm/smarthut:${CI_COMMIT_BRANCH}" + after_script: + - docker logout diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..18cd721 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +#FROM mhart/alpine-node:11 AS pleaseGodWork +#WORKDIR /app +#COPY . /app +#RUN ls +#RUN yarn run build +# +#RUN yarn global add serve +# +# +#CMD ["serve", "-p", "8080", "-s", "."] + +# base image +FROM node:9.6.1 +RUN mkdir /usr/src/app +WORKDIR /usr/src/app +ENV PATH /usr/src/app/node_modules/.bin:$PATH + + +COPY smart-hut/package.json /usr/src/app/package.json +RUN npm install --silent +RUN npm install react-scripts@1.1.1 -g --silent + + +CMD ["npm", "start"] + +FROM node:9.6.1 as builder +RUN mkdir /usr/src/app +WORKDIR /usr/src/app +ENV PATH /usr/src/app/node_modules/.bin:$PATH +COPY smart-hut/package.json /usr/src/app/package.json +RUN npm install --silent +RUN npm install react-scripts@1.1.1 -g --silent +COPY smart-hut/. /usr/src/app +RUN npm run build + +FROM nginx:1.13.9-alpine +COPY --from=builder /usr/src/app/build /usr/share/nginx/html +EXPOSE 8080 +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file