diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..9e49e45 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,20 @@ +# Dependency directories +node_modules/ + +# Build directory +build/ + +# Downloaded data files +data/* +!data/*.csv +!data/background.png + +# Configuration +config.json +.env + +# Log files +*.log + +# Git folder +.git/ diff --git a/.env.example b/.env.example index bc55db4..c6c9449 100644 --- a/.env.example +++ b/.env.example @@ -10,12 +10,12 @@ ACORE_ARMORY_REALMS__0__REALM_ID=1 ACORE_ARMORY_REALMS__0__AUTH_DATABASE="acore_auth" ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__HOST="localhost" ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__PORT=3306 -ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__USER="root" -ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__PASSWORD="root" +ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__USER="acore" +ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__PASSWORD="acore" ACORE_ARMORY_REALMS__0__CHARACTERS_DATABASE__DATABASE="acore_characters" ACORE_ARMORY_WORLD_DATABASE__HOST="localhost" ACORE_ARMORY_WORLD_DATABASE__PORT=3306 -ACORE_ARMORY_WORLD_DATABASE__USER="root" -ACORE_ARMORY_WORLD_DATABASE__PASSWORD="root" +ACORE_ARMORY_WORLD_DATABASE__USER="acore" +ACORE_ARMORY_WORLD_DATABASE__PASSWORD="acore" ACORE_ARMORY_WORLD_DATABASE__DATABASE="acore_world" ACORE_ARMORY_DB_QUERY_TIMEOUT=10000 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..96d602e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM node:16 + +COPY package*.json ./ +RUN npm install + +COPY . . +RUN npm run build +CMD [ "npm", "start" ] diff --git a/config.default.json b/config.default.json index b48f1b4..d8dfecc 100644 --- a/config.default.json +++ b/config.default.json @@ -16,8 +16,8 @@ "charactersDatabase": { "host": "localhost", "port": 3306, - "user": "root", - "password": "root", + "user": "acore", + "password": "acore", "database": "acore_characters" } } @@ -25,8 +25,8 @@ "worldDatabase": { "host": "localhost", "port": 3306, - "user": "root", - "password": "root", + "user": "acore", + "password": "acore", "database": "acore_world" }, "dbQueryTimeout": 10000 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..373e708 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +services: + armory: + restart: unless-stopped + build: + context: . + dockerfile: Dockerfile + volumes: + - ./data:/data/ + - ./logs:/logs/ + env_file: + - .env + networks: + - local-private-net + ports: + - 48733:48733 + +networks: + local-private-net: + driver: bridge diff --git a/package-lock.json b/package-lock.json index 0118a38..61d1ea0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "azerothcore-armory", - "version": "0.11.0", + "version": "0.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "azerothcore-armory", - "version": "0.11.0", + "version": "0.12.0", "license": "MIT", "dependencies": { "@supercharge/promise-pool": "^2.1.0", diff --git a/package.json b/package.json index 13468b2..759f051 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "azerothcore-armory", - "version": "0.11.0", + "version": "0.12.0", "description": "", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/src/armory/Armory.ts b/src/armory/Armory.ts index bc90a54..7b9437b 100644 --- a/src/armory/Armory.ts +++ b/src/armory/Armory.ts @@ -38,8 +38,8 @@ export class Armory { ), transports: [ new winston.transports.Console({ level: "debug" }), - new winston.transports.File({ filename: "armory.error.log", level: "error" }), - new winston.transports.File({ filename: "armory.combined.log", level: "http" }), + new winston.transports.File({ filename: path.join("logs", "armory.error.log"), level: "error" }), + new winston.transports.File({ filename: path.join("logs", "armory.combined.log"), level: "http" }), ], }); this.charsetCache = {};