Skip to content

Commit

Permalink
added node_modules/ to dockerignore, exposed 'ts-node typeorm/cli' vi…
Browse files Browse the repository at this point in the history
…a ts-typeorm script
  • Loading branch information
Goran Jankovic committed May 31, 2019
1 parent 7a4bfe3 commit 2ae5c19
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
API_URL=http://vivifyideas.com
API_URL=http://localhost:80
JWT_SECRET_KEY=uAsBw6WxqD
JWT_EXPIRATION_TIME=3600
JWT_EXPIRATION_TIME=3600
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ yarn-error.log
/.nyc_output
build/config\.gypi

sqlite-example.sql
sqlite-example.sql
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ RUN yarn
COPY . .

EXPOSE 3000

CMD [ "yarn", "start:dev" ]
1 change: 0 additions & 1 deletion Dockerfile-nginx
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ RUN set -ex && \
COPY ./docker/vhost.template /etc/nginx/conf.d/vhost.template

CMD ["/entrypoint-nginx.sh"]

1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,3 @@ services:

volumes:
mariadbdata:

6 changes: 6 additions & 0 deletions init
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,9 @@ docker-compose up -d
if [ $? -ne 0 ]; then
err "Error while starting docker-compose stack."
fi

log "Running schema:sync..."
docker exec -it nest yarn ts-typeorm schema:sync
if [ $? -ne 0 ]; then
err "Error while running schema:sync"
fi
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:e2e": "jest --config ./test/jest-e2e.json",
"webpack": "webpack --config webpack.config.js"
"webpack": "webpack --config webpack.config.js",
"ts-typeorm": "ts-node ./node_modules/typeorm/cli.js"
},
"dependencies": {
"@nestjs/common": "^6.0.1",
Expand Down

0 comments on commit 2ae5c19

Please sign in to comment.