Deploy -> fix conflicts

feature/2_forms
TBS093A 2021-05-17 12:29:48 +02:00
commit 7f07a8178f
1 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# pull official base image # pull official base image
FROM node:13.12.0-alpine FROM node:13.12.0-alpine
@ -35,3 +36,17 @@ CMD ["npm", "start"]
# RUN npm install -g gatsby-cli # RUN npm install -g gatsby-cli
# CMD ['gatsby', 'develop', '-H', '0.0.0.0:8000'] # CMD ['gatsby', 'develop', '-H', '0.0.0.0:8000']
=======
FROM node:14.4.0
WORKDIR /usr/src/app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm install -g gatsby-cli
CMD ['gatsby', 'develop', '-H', '0.0.0.0:8000']
>>>>>>> feature/2_forms