From ea78b6feb970827026a93e7118eabd23a0db6ae0 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Sun, 1 Jul 2018 18:23:40 -0500 Subject: [PATCH] Changed docker file names (#10489) --- Dockerfile | 47 ++++++++++++++++++++++++++----------------- Dockerfile-Dev | 18 +++++++++++++++++ Dockerfile-Production | 29 -------------------------- 3 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 Dockerfile-Dev delete mode 100644 Dockerfile-Production diff --git a/Dockerfile b/Dockerfile index e5a4dbc4b3..c60a444cc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,29 @@ -FROM node:8 - -# Install global packages -RUN npm install -g gulp-cli 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 cp config.json.example config.json -RUN npm install - -# Create Build dir -RUN mkdir -p ./website/build - -# Start Habitica -EXPOSE 3000 -CMD ["npm", "start"] +FROM node:8 + +ENV ADMIN_EMAIL admin@habitica.com +ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e +ENV AMAZON_PAYMENTS_SELLER_ID AMQ3SB4SG5E91 +ENV AMPLITUDE_KEY e8d4c24b3d6ef3ee73eeba715023dd43 +ENV BASE_URL https://habitica.com +ENV FACEBOOK_KEY 128307497299777 +ENV GA_ID UA-33510635-1 +ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleusercontent.com +ENV NODE_ENV production +ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA + +# Install global packages +RUN npm install -g gulp-cli mocha + +# Clone Habitica repo and install dependencies +RUN mkdir -p /usr/src/habitrpg +WORKDIR /usr/src/habitrpg +RUN git clone --branch release https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN npm install +RUN gulp build:prod --force + +# Create Build dir +RUN mkdir -p ./website/build + +# Start Habitica +EXPOSE 3000 +CMD ["node", "./website/transpiled-babel/index.js"] diff --git a/Dockerfile-Dev b/Dockerfile-Dev new file mode 100644 index 0000000000..e5a4dbc4b3 --- /dev/null +++ b/Dockerfile-Dev @@ -0,0 +1,18 @@ +FROM node:8 + +# Install global packages +RUN npm install -g gulp-cli 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 cp config.json.example config.json +RUN npm install + +# Create Build dir +RUN mkdir -p ./website/build + +# Start Habitica +EXPOSE 3000 +CMD ["npm", "start"] diff --git a/Dockerfile-Production b/Dockerfile-Production deleted file mode 100644 index 957c09b298..0000000000 --- a/Dockerfile-Production +++ /dev/null @@ -1,29 +0,0 @@ -FROM node:8 - -ENV ADMIN_EMAIL admin@habitica.com -ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e -ENV AMAZON_PAYMENTS_SELLER_ID AMQ3SB4SG5E91 -ENV AMPLITUDE_KEY e8d4c24b3d6ef3ee73eeba715023dd43 -ENV BASE_URL https://habitica.com -ENV FACEBOOK_KEY 128307497299777 -ENV GA_ID UA-33510635-1 -ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleusercontent.com -ENV NODE_ENV production -ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA - -# Install global packages -RUN npm install -g gulp-cli mocha - -# Clone Habitica repo and install dependencies -RUN mkdir -p /usr/src/habitrpg -WORKDIR /usr/src/habitrpg -RUN git clone --branch v4.50.1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg -RUN npm install -RUN gulp build:prod --force - -# Create Build dir -RUN mkdir -p ./website/build - -# Start Habitica -EXPOSE 3000 -CMD ["node", "./website/transpiled-babel/index.js"]