diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..62d3e94 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,23 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +README.md \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..bdb89fb --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,11 @@ +{ + "configurations": [ + { + "name": "Docker Node.js Launch and Attach", + "type": "docker", + "request": "launch", + "preLaunchTask": "docker-run: debug", + "platform": "node" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..007bfd9 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,37 @@ +{ + "tasks": [ + { + "type": "docker-build", + "label": "docker-build", + "platform": "node", + "dockerBuild": { + "dockerfile": "${workspaceFolder}/Dockerfile", + "context": "${workspaceFolder}" + } + }, + { + "type": "docker-run", + "label": "docker-run: release", + "dependsOn": [ + "docker-build" + ], + "platform": "node" + }, + { + "type": "docker-run", + "label": "docker-run: debug", + "dependsOn": [ + "docker-build" + ], + "dockerRun": { + "env": { + "DEBUG": "*", + "NODE_ENV": "development" + } + }, + "node": { + "enableDebugging": true + } + } + ] +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ebb3ec8..b336ace 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,7 @@ FROM node:current-alpine AS builder - -WORKDIR /app - +WORKDIR /usr/src/app COPY /package.json /app/ - +COPY ["package.json", "package-lock.json*", "npm-shrinkwrap.json*", "./"] RUN apk add --no-cache git - RUN npm install - -COPY . /app/ - -CMD ["sh", "checkIsUp.sh"] +COPY . . diff --git a/README.md b/README.md index a527c67..3e0fb1c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ following instructions from: -https://www.freecodecamp.org/news/how-to-enable-es6-and-beyond-syntax-with-node-and-express-68d3e11fe1ab/ \ No newline at end of file +https://www.freecodecamp.org/news/how-to-enable-es6-and-beyond-syntax-with-node-and-express-68d3e11fe1ab/ + +Can be used as a template for ES6 NodeJS projects. \ No newline at end of file diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml new file mode 100644 index 0000000..f03fc95 --- /dev/null +++ b/docker-compose.debug.yml @@ -0,0 +1,14 @@ +version: '2.1' + +services: + es6-nodejs: + image: es6-nodejs + container_name: es6-nodejs + build: . + environment: + NODE_ENV: development + ports: + - 3001:3001 + - 9229:9229 + ## set your startup file here + command: node --inspect=0.0.0.0:9229 index.js \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..0372529 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.7' + +services: + es6-nodejs: + image: es6-nodejs + container_name: es6-nodejs + build: . + ports: + - 3001:3001 + environment: + - PORT=3001 + command: ["npm","run","dev"] \ No newline at end of file diff --git a/src/app.js b/src/app.js index 1d45e83..db8913a 100644 --- a/src/app.js +++ b/src/app.js @@ -1,25 +1,5 @@ -// var express = require('express'); -// var path = require('path'); -// var cookieParser = require('cookie-parser'); -// var logger = require('morgan'); - -// var indexRouter = require('./routes/index'); -// var usersRouter = require('./routes/users'); - -// var app = express(); - -// app.use(logger('dev')); -// app.use(express.json()); -// app.use(express.urlencoded({ extended: false })); -// app.use(cookieParser()); -// app.use(express.static(path.join(__dirname, 'public'))); - -// app.use('/', indexRouter); -// app.use('/users', usersRouter); - -// module.exports = app; - // app.js + import express from 'express'; import path from 'path'; import cookieParser from 'cookie-parser'; diff --git a/src/routes/index.js b/src/routes/index.js index 38c8c4a..cd0f712 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -1,14 +1,3 @@ -// var express = require('express'); -// var router = express.Router(); - -// /* GET home page. */ -// router.get('/', function(req, res, next) { -// res.render('index', { title: 'Express' }); -// }); - -// module.exports = router; - - // routes/index.js import express from 'express'; var router = express.Router();