diff --git a/Dockerfile-prod b/Docker-Dev similarity index 78% rename from Dockerfile-prod rename to Docker-Dev index b31b811f2f..fb782d808e 100644 --- a/Dockerfile-prod +++ b/Docker-Dev @@ -1,18 +1,18 @@ -FROM node:boron - -# Install global packages -RUN npm install -g gulp grunt-cli bower mocha - -# Clone Habitica repo and install dependencies -RUN mkdir -p /usr/src/habitrpg -WORKDIR /usr/src/habitrpg -RUN git clone --branch v3.99.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg -RUN npm install -RUN bower install --allow-root - -# Create Build dir -RUN mkdir -p ./website/build - -# Start Habitica -EXPOSE 3000 -CMD ["npm", "start"] +FROM node:boron + +# Install global packages +RUN npm install -g gulp grunt-cli bower mocha + +# Clone Habitica repo and install dependencies +RUN mkdir -p /usr/src/habitrpg +WORKDIR /usr/src/habitrpg +RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN npm install +RUN bower install --allow-root + +# Create Build dir +RUN mkdir -p ./website/build + +# Start Habitica +EXPOSE 3000 +CMD ["npm", "start"] diff --git a/Dockerfile b/Dockerfile index 69f1ceae7c..568add8faf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,14 @@ RUN npm install -g gulp grunt-cli bower mocha # Clone Habitica repo and install dependencies RUN mkdir -p /usr/src/habitrpg WORKDIR /usr/src/habitrpg -RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN git clone --branch v3.99.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg RUN npm install RUN bower install --allow-root +RUN gulp build:prod --force # Create Build dir RUN mkdir -p ./website/build # Start Habitica EXPOSE 3000 -CMD ["npm", "start"] +CMD ["node", "./website/transpiled-babel/index.js"]