Merge pull request #28 from jdrouet/express-mysql
react-express-mysql: fetch version from mysqlmaster
Guillaume LOURS
5 years ago
committed by
GitHub
commit
a06e22defb
@ -0,0 +1 @@
|
||||
node_modules
|
||||
@ -1,36 +1,31 @@
|
||||
# if you're doing anything beyond your local machine, please pin this to a specific version at https://hub.docker.com/_/node/
|
||||
FROM node:10
|
||||
|
||||
RUN mkdir -p /opt/app
|
||||
FROM node:lts
|
||||
|
||||
# set our node environment, either development or production
|
||||
# defaults to production, compose overrides this to development on build and run
|
||||
ARG NODE_ENV=production
|
||||
ENV NODE_ENV $NODE_ENV
|
||||
|
||||
WORKDIR /code
|
||||
|
||||
# default to port 80 for node, and 9229 and 9230 (tests) for debug
|
||||
ARG PORT=80
|
||||
ENV PORT $PORT
|
||||
EXPOSE $PORT 9229 9230
|
||||
|
||||
# you'll likely want the latest npm, reguardless of node version, for speed and fixes
|
||||
RUN npm i npm@latest -g
|
||||
|
||||
# install dependencies first, in a different location for easier app bind mounting for local development
|
||||
WORKDIR /opt
|
||||
COPY package.json package-lock.json* ./
|
||||
RUN npm install && npm cache clean --force
|
||||
ENV PATH /opt/node_modules/.bin:$PATH
|
||||
COPY package.json /code/package.json
|
||||
COPY package-lock.json /code/package-lock.json
|
||||
RUN npm ci
|
||||
|
||||
# check every 30s to ensure this service returns HTTP 200
|
||||
HEALTHCHECK --interval=30s CMD node healthcheck.js
|
||||
HEALTHCHECK --interval=30s \
|
||||
CMD node healthcheck.js
|
||||
|
||||
# copy in our source code last, as it changes the most
|
||||
WORKDIR /opt/app
|
||||
COPY . /opt/app
|
||||
COPY . /code
|
||||
|
||||
# if you want to use npm start instead, then use `docker run --init in production`
|
||||
# so that signals are passed properly. Note the code in index.js is needed to catch Docker signals
|
||||
# using node here is still more graceful stopping then npm with --init afaik
|
||||
# I still can't come up with a good production way to run with npm and graceful shutdown
|
||||
CMD [ "node", "index.js" ]
|
||||
CMD [ "node", "src/index.js" ]
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
// simple node web server that displays hello world
|
||||
// optimized for Docker image
|
||||
|
||||
var express = require('express');
|
||||
// this example uses express web framework so we know what longer build times
|
||||
// do and how Dockerfile layer ordering matters. If you mess up Dockerfile ordering
|
||||
// you'll see long build times on every code change + build. If done correctly,
|
||||
// code changes should be only a few seconds to build locally due to build cache.
|
||||
|
||||
var morgan = require('morgan');
|
||||
// morgan provides easy logging for express, and by default it logs to stdout
|
||||
// which is a best practice in Docker. Friends don't let friends code their apps to
|
||||
// do app logging to files in containers.
|
||||
|
||||
// Constants
|
||||
const PORT = process.env.PORT || 8080;
|
||||
// if you're not using docker-compose for local development, this will default to 8080
|
||||
// to prevent non-root permission problems with 80. Dockerfile is set to make this 80
|
||||
// because containers don't have that issue :)
|
||||
|
||||
// Appi
|
||||
var app = express();
|
||||
|
||||
app.use(morgan('common'));
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
res.json({ message: 'Hello Docker World!' });
|
||||
});
|
||||
|
||||
app.get('/healthz', function (req, res) {
|
||||
// do app logic here to determine if app is truly healthy
|
||||
// you should return 200 if healthy, and anything else will fail
|
||||
// if you want, you should be able to restrict this to localhost (include ipv4 and ipv6)
|
||||
res.send('I am happy and healthy\n');
|
||||
});
|
||||
|
||||
var server = app.listen(PORT, function () {
|
||||
console.log('Webserver is ready');
|
||||
});
|
||||
|
||||
|
||||
//
|
||||
// need this in docker container to properly exit since node doesn't handle SIGINT/SIGTERM
|
||||
// this also won't work on using npm start since:
|
||||
// https://github.com/npm/npm/issues/4603
|
||||
// https://github.com/npm/npm/pull/10868
|
||||
// https://github.com/RisingStack/kubernetes-graceful-shutdown-example/blob/master/src/index.js
|
||||
// if you want to use npm then start with `docker run --init` to help, but I still don't think it's
|
||||
// a graceful shutdown of node process
|
||||
//
|
||||
|
||||
// quit on ctrl-c when running docker in terminal
|
||||
process.on('SIGINT', function onSigint () {
|
||||
console.info('Got SIGINT (aka ctrl-c in docker). Graceful shutdown ', new Date().toISOString());
|
||||
shutdown();
|
||||
});
|
||||
|
||||
// quit properly on docker stop
|
||||
process.on('SIGTERM', function onSigterm () {
|
||||
console.info('Got SIGTERM (docker container stop). Graceful shutdown ', new Date().toISOString());
|
||||
shutdown();
|
||||
})
|
||||
|
||||
// shut down server
|
||||
function shutdown() {
|
||||
server.close(function onServerClosed (err) {
|
||||
if (err) {
|
||||
console.error(err);
|
||||
process.exitCode = 1;
|
||||
}
|
||||
process.exit();
|
||||
})
|
||||
}
|
||||
//
|
||||
// need above in docker container to properly exit
|
||||
//
|
||||
|
||||
module.exports = app;
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,20 @@
|
||||
const fs = require("fs");
|
||||
|
||||
const readFileSync = filename => fs.readFileSync(filename).toString("utf8");
|
||||
|
||||
// Constants
|
||||
module.exports = {
|
||||
database: {
|
||||
host: process.env.DATABASE_HOST || "localhost",
|
||||
port: process.env.DATABASE_PORT,
|
||||
database: process.env.DATABASE_DB,
|
||||
user: process.env.DATABASE_USER,
|
||||
password: process.env.DATABASE_PASSWORD
|
||||
? readFileSync(process.env.DATABASE_PASSWORD)
|
||||
: null
|
||||
},
|
||||
port: process.env.PORT || 8080
|
||||
// if you're not using docker-compose for local development, this will default to 8080
|
||||
// to prevent non-root permission problems with 80. Dockerfile is set to make this 80
|
||||
// because containers don't have that issue :)
|
||||
};
|
||||
@ -0,0 +1,7 @@
|
||||
const knex = require('knex');
|
||||
const { database } = require('./config');
|
||||
|
||||
module.exports = knex({
|
||||
client: 'mysql2',
|
||||
connection: database,
|
||||
});
|
||||
@ -0,0 +1,48 @@
|
||||
const app = require("./server");
|
||||
const { port } = require("./config");
|
||||
|
||||
const server = app.listen(port, function() {
|
||||
console.log("Webserver is ready");
|
||||
});
|
||||
|
||||
//
|
||||
// need this in docker container to properly exit since node doesn't handle SIGINT/SIGTERM
|
||||
// this also won't work on using npm start since:
|
||||
// https://github.com/npm/npm/issues/4603
|
||||
// https://github.com/npm/npm/pull/10868
|
||||
// https://github.com/RisingStack/kubernetes-graceful-shutdown-example/blob/master/src/index.js
|
||||
// if you want to use npm then start with `docker run --init` to help, but I still don't think it's
|
||||
// a graceful shutdown of node process
|
||||
//
|
||||
|
||||
// quit on ctrl-c when running docker in terminal
|
||||
process.on("SIGINT", function onSigint() {
|
||||
console.info(
|
||||
"Got SIGINT (aka ctrl-c in docker). Graceful shutdown ",
|
||||
new Date().toISOString()
|
||||
);
|
||||
shutdown();
|
||||
});
|
||||
|
||||
// quit properly on docker stop
|
||||
process.on("SIGTERM", function onSigterm() {
|
||||
console.info(
|
||||
"Got SIGTERM (docker container stop). Graceful shutdown ",
|
||||
new Date().toISOString()
|
||||
);
|
||||
shutdown();
|
||||
});
|
||||
|
||||
// shut down server
|
||||
function shutdown() {
|
||||
server.close(function onServerClosed(err) {
|
||||
if (err) {
|
||||
console.error(err);
|
||||
process.exit(1);
|
||||
}
|
||||
process.exit(0);
|
||||
});
|
||||
}
|
||||
//
|
||||
// need above in docker container to properly exit
|
||||
//
|
||||
@ -0,0 +1,36 @@
|
||||
// simple node web server that displays hello world
|
||||
// optimized for Docker image
|
||||
|
||||
const express = require("express");
|
||||
// this example uses express web framework so we know what longer build times
|
||||
// do and how Dockerfile layer ordering matters. If you mess up Dockerfile ordering
|
||||
// you'll see long build times on every code change + build. If done correctly,
|
||||
// code changes should be only a few seconds to build locally due to build cache.
|
||||
|
||||
const morgan = require("morgan");
|
||||
// morgan provides easy logging for express, and by default it logs to stdout
|
||||
// which is a best practice in Docker. Friends don't let friends code their apps to
|
||||
// do app logging to files in containers.
|
||||
|
||||
const database = require("./database");
|
||||
|
||||
// Appi
|
||||
const app = express();
|
||||
|
||||
app.use(morgan("common"));
|
||||
|
||||
app.get("/", function(req, res, next) {
|
||||
database.raw('select VERSION() version')
|
||||
.then(([rows, columns]) => rows[0])
|
||||
.then((row) => res.json({ message: `Hello from MySQL ${row.version}` }))
|
||||
.catch(next);
|
||||
});
|
||||
|
||||
app.get("/healthz", function(req, res) {
|
||||
// do app logic here to determine if app is truly healthy
|
||||
// you should return 200 if healthy, and anything else will fail
|
||||
// if you want, you should be able to restrict this to localhost (include ipv4 and ipv6)
|
||||
res.send("I am happy and healthy\n");
|
||||
});
|
||||
|
||||
module.exports = app;
|
||||
Loading…
Reference in New Issue