Deploy -> fix conflicts
parent
7f07a8178f
commit
37f7f6448e
15
Dockerfile
15
Dockerfile
|
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
# pull official base image
|
||||
FROM node:13.12.0-alpine
|
||||
|
||||
|
|
@ -36,17 +35,3 @@ CMD ["npm", "start"]
|
|||
# RUN npm install -g gatsby-cli
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue