test ready
This commit is contained in:
parent
7d8b0ec3cc
commit
514a344faf
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1 +1,2 @@
|
||||||
/node_modules
|
/node_modules
|
||||||
|
/mysql
|
2
db.js
2
db.js
|
@ -1,7 +1,7 @@
|
||||||
const mysql = require('mysql');
|
const mysql = require('mysql');
|
||||||
|
|
||||||
const logcon = mysql.createConnection({
|
const logcon = mysql.createConnection({
|
||||||
host: 'localhost',
|
host: 'db',
|
||||||
user: 'user',
|
user: 'user',
|
||||||
password: 'user',
|
password: 'user',
|
||||||
database: 'users'
|
database: 'users'
|
||||||
|
|
|
@ -8,11 +8,22 @@ services:
|
||||||
- 3306:3306
|
- 3306:3306
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: root
|
MYSQL_ROOT_PASSWORD: root
|
||||||
|
volumes:
|
||||||
|
- ./mysql/:/var/lib/mysql
|
||||||
|
|
||||||
phpmyadmin:
|
node:
|
||||||
image: phpmyadmin
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- 2000:80
|
- 8080:8080
|
||||||
environment:
|
volumes:
|
||||||
- PMA_ARBITRARY=1
|
- ./:/usr/src/app
|
||||||
|
# phpmyadmin:
|
||||||
|
# image: phpmyadmin
|
||||||
|
# restart: always
|
||||||
|
# ports:
|
||||||
|
# - 2000:80
|
||||||
|
# environment:
|
||||||
|
# - PMA_ARBITRARY=1
|
2
index.js
2
index.js
|
@ -385,4 +385,4 @@ app.all('*', (req, res) => {
|
||||||
res.status(404).send('<h1>404! Page not</h1> <br> <a href="/">go to main page</a>');
|
res.status(404).send('<h1>404! Page not</h1> <br> <a href="/">go to main page</a>');
|
||||||
});
|
});
|
||||||
|
|
||||||
app.listen(process.env.PORT || 3002, () => console.log("started"));
|
app.listen(process.env.PORT || 8080, () => console.log("started"));
|
Loading…
Reference in New Issue
Block a user