Skip to content

Commit

Permalink
Update for contentedit
Browse files Browse the repository at this point in the history
  • Loading branch information
Hevron, David authored and Hevron, David committed Jul 18, 2017
1 parent a97e913 commit 112a14b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ RUN apt-get install -y make gcc g++ python git
COPY package.json /opt/app/
COPY plugins/auth_plugin/package.json /opt/app/plugins/auth_plugin/
COPY plugins/navbobulator/package.json /opt/app/plugins/navbobulator/
COPY plugins/contentedit/package.json /opt/app/plugins/contentedit/
RUN npm install


# Bundle app source
COPY . /opt/app
RUN cd plugins/auth_plugin && npm link && cd ../../
RUN cd plugins/navbobulator && npm link && cd ../../
RUN npm link auth_plugin navbobulator
RUN cd plugins/contentedit && npm link && cd ../../
RUN npm link auth_plugin navbobulator contentedit


EXPOSE 8000
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.codebuild
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:boron

ARG GIT_BRANCH="new-develop"
ARG GIT_BRANCH="develop"

# Create app directory
RUN mkdir -p /opt/app
Expand All @@ -12,7 +12,8 @@ RUN apt-get install -y make gcc g++ python git
RUN git clone https://github.com/hydrotik/node-hapi-react-redux-sass-typescript-mongo-webpack-hmr-gulp --depth 1 -b ${GIT_BRANCH} . && git submodule update --init
RUN cd plugins/auth_plugin && npm link && cd ../../
RUN cd plugins/navbobulator && npm link && cd ../../
RUN npm install && npm link navbobulator auth_plugin
RUN cd plugins/contentedit && npm link && cd ../../
RUN npm install && npm link navbobulator auth_plugin contentedit

EXPOSE 8000
EXPOSE 8001
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
environment:
- NODE_ENV=development
- MONGO_URI=mongodb://admin:admin@mongo:27017/watts?authSource=admin
- SECRET_KEY=secret
container_name: csione

mongo:
Expand Down
2 changes: 1 addition & 1 deletion mongo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG ADMIN_PASS
COPY mongo-setup.sh /
COPY db.js /
COPY header.data.json /
RUN chmod +x /mongo-setup.sh
RUN chmod 755 /mongo-setup.sh
RUN echo ${USERADMIN_PASS}
RUN USERADMIN_PASS=${USERADMIN_PASS} ADMIN_PASS=${ADMIN_PASS} /mongo-setup.sh

Expand Down
2 changes: 1 addition & 1 deletion plugins/contentedit

0 comments on commit 112a14b

Please sign in to comment.