Preparing for Egg Trainer merge

This commit is contained in:
2021-11-18 14:56:59 +00:00
parent 655c81174e
commit e0b3193607
5 changed files with 6 additions and 15 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
docker_image: krgamestudios/chat-server docker_image: krgamestudios/chat-server
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
+1 -1
View File
@@ -76,7 +76,7 @@ services:
MYSQL_USER: ${appDBUser} MYSQL_USER: ${appDBUser}
MYSQL_PASSWORD: ${appDBPass} MYSQL_PASSWORD: ${appDBPass}
MYSQL_ROOT_PASSWORD: ${dbRootPass} MYSQL_ROOT_PASSWORD: ${dbRootPass}
networks: networks:
- app-network - app-network
volumes: volumes:
- ./mysql:/var/lib/mysql - ./mysql:/var/lib/mysql
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "chat-server", "name": "chat-server",
"version": "1.2.2", "version": "1.2.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "chat-server", "name": "chat-server",
"version": "1.2.2", "version": "1.2.3",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"cors": "^2.8.5", "cors": "^2.8.5",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "chat-server", "name": "chat-server",
"version": "1.2.2", "version": "1.2.3",
"description": "An API centric chat server. Uses Sequelize and mariaDB by default.", "description": "An API centric chat server. Uses Sequelize and mariaDB by default.",
"main": "server/server.js", "main": "server/server.js",
"scripts": { "scripts": {
+1 -10
View File
@@ -1,9 +1,7 @@
const Sequelize = require('sequelize'); const Sequelize = require('sequelize');
const sequelize = require('..'); const sequelize = require('..');
const chatlog = require('./chatlog'); module.exports = sequelize.define('reports', {
const reports = sequelize.define('reports', {
index: { index: {
type: Sequelize.INTEGER(11), type: Sequelize.INTEGER(11),
allowNull: false, allowNull: false,
@@ -17,10 +15,3 @@ const reports = sequelize.define('reports', {
allowNull: false allowNull: false
}, },
}); });
chatlog.hasMany(reports, { foreignKey: 'chatlogIndex', foreignKeyConstraint: true });
reports.belongsTo(chatlog, { foreignKey: 'chatlogIndex' });
sequelize.sync();
module.exports = reports;