From aa14252108adebf156e277195b51d892130f3de0 Mon Sep 17 00:00:00 2001 From: Joshua Schmitt Date: Tue, 5 Jul 2022 21:56:46 +0200 Subject: [PATCH] fix: :construction: fix review files --- .env.docker | 31 ++++++++++++++++++++++++++++ Dockerfile | 7 +++++-- docker-compose.dev.yml | 46 ++++++++++++++++++++++-------------------- docker-compose.yml | 46 ++++++++++++++++++++++-------------------- 4 files changed, 84 insertions(+), 46 deletions(-) create mode 100644 .env.docker diff --git a/.env.docker b/.env.docker new file mode 100644 index 0000000..98657c8 --- /dev/null +++ b/.env.docker @@ -0,0 +1,31 @@ +# RENAME THIS FILE TO .env TO USE IT WITH DOCKER! + +# Discord +DISCORD_TOKEN= +DISCORD_CLIENT_ID= +DISCORD_GUILD_ID= + +# Database +MONGO_USER= +MONGO_PASS= + +# Encryption +ENCRYPTION_ALGORITHM=aes-256-ctr +ENCRYPTION_SECRET=A RANDOM STRING WITH LENGTH OF 32 + +#Embed +EMEBD_COLOR_SUCCESS=#22bb33 +EMBED_COLOR_WAIT=#f0ad4e +EMBED_COLOR_ERROR=#bb2124 +EMBED_FOOTER_TEXT=https://github.com/ZynerOrg/xyter +EMBED_FOOTER_ICON=https://github.com/ZynerOrg.png + +# Log +LOG_LEVEL=silly + +# Reputation +REPUTATION_TIMEOUT=86400 + +# Bot Hoster +BOT_HOSTER_NAME=Zyner +BOT_HOSTER_URL=https://xyter.zyner.org/customization/change-hoster diff --git a/Dockerfile b/Dockerfile index af5581d..a626b7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:16 LABEL maintainer="xyter@zyner.org" -WORKDIR /app +WORKDIR /build COPY package* . RUN npm install @@ -11,6 +11,9 @@ COPY . . RUN npx -y tsc -WORKDIR /app/build +WORKDIR /app + +RUN cp -r /build/build/* . +RUN cp -r /build/node_modules . CMD [ "node", "." ] \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 5765287..fed3dc4 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -5,29 +5,31 @@ services: build: . restart: unless-stopped environment: - - DISCORD_TOKEN=YOUR TOKEN - - DISCORD_CLIENT_ID=YOUR CLIENT ID - - DISCORD_GUILD_ID=YOUR GUILD ID - ### LEAVE THIS AS IT IS! ### - - MONGO_URL=mongodb://mongodb:27017/xyter?retryWrites=true&w=majority - ############################ - - ENCRYPTION_ALGORITHM=aes-256-ctr - - ENCRYPTION_SECRET=A RANDOM STRING WITH LENGTH OF 32 - - EMEBD_COLOR_SUCCESS=#22bb33 - - EMBED_COLOR_WAIT=#f0ad4e - - EMBED_COLOR_ERROR=#bb2124 - - EMBED_FOOTER_TEXT=https://github.com/ZynerOrg/xyter - - EMBED_FOOTER_ICON=https://github.com/ZynerOrg.png - - LOG_LEVEL=silly - - REPUTATION_TIMEOUT=86400 - - BOT_HOSTER_NAME=Zyner - - BOT_HOSTER_URL=https://xyter.zyner.org/customization/change-hoster - - NODE_ENV=production + - DISCORD_TOKEN=${DISCORD_TOKEN} + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + - DISCORD_GUILD_ID=${DISCORD_GUILD_ID} + - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASS}@mongodb:27017/admin?retryWrites=true&w=majority + - ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM} + - ENCRYPTION_SECRET=${ENCRYPTION_SECRET} + - EMEBD_COLOR_SUCCESS=${EMEBD_COLOR_SUCCESS} + - EMBED_COLOR_WAIT=${EMBED_COLOR_WAIT} + - EMBED_COLOR_ERROR=${EMBED_COLOR_ERROR} + - EMBED_FOOTER_TEXT=${EMBED_FOOTER_TEXT} + - EMBED_FOOTER_ICON=${EMBED_FOOTER_ICON} + - LOG_LEVEL=${LOG_LEVEL} + - REPUTATION_TIMEOUT=${REPUTATION_TIMEOUT} + - BOT_HOSTER_NAME=${BOT_HOSTER_NAME} + - BOT_HOSTER_URL=${BOT_HOSTER_URL} + - NODE_ENV=development stdin_open: true tty: true - mongodb: - image: mongo:4.2.21 - restart: unless-stopped volumes: - - ./logs:/app/build/logs + - ./logs:/app/logs + mongodb: + image: mongo:latest + restart: unless-stopped + environment: + MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} + MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS} + volumes: - ./database:/data/db diff --git a/docker-compose.yml b/docker-compose.yml index 9b08008..7cc272a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,32 +2,34 @@ services: app: depends_on: - mongodb - image: zyner/xyter:2022.07.0 + image: zyner/xyter:latest restart: unless-stopped environment: - - DISCORD_TOKEN=YOUR TOKEN - - DISCORD_CLIENT_ID=YOUR CLIENT ID - - DISCORD_GUILD_ID=YOUR GUILD ID - ### LEAVE THIS AS IT IS! ### - - MONGO_URL=mongodb://mongodb:27017/xyter?retryWrites=true&w=majority - ############################ - - ENCRYPTION_ALGORITHM=aes-256-ctr - - ENCRYPTION_SECRET=A RANDOM STRING WITH LENGTH OF 32 - - EMEBD_COLOR_SUCCESS=#22bb33 - - EMBED_COLOR_WAIT=#f0ad4e - - EMBED_COLOR_ERROR=#bb2124 - - EMBED_FOOTER_TEXT=https://github.com/ZynerOrg/xyter - - EMBED_FOOTER_ICON=https://github.com/ZynerOrg.png - - LOG_LEVEL=silly - - REPUTATION_TIMEOUT=86400 - - BOT_HOSTER_NAME=Zyner - - BOT_HOSTER_URL=https://xyter.zyner.org/customization/change-hoster + - DISCORD_TOKEN=${DISCORD_TOKEN} + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + - DISCORD_GUILD_ID=${DISCORD_GUILD_ID} + - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASS}@mongodb:27017/admin?retryWrites=true&w=majority + - ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM} + - ENCRYPTION_SECRET=${ENCRYPTION_SECRET} + - EMEBD_COLOR_SUCCESS=${EMEBD_COLOR_SUCCESS} + - EMBED_COLOR_WAIT=${EMBED_COLOR_WAIT} + - EMBED_COLOR_ERROR=${EMBED_COLOR_ERROR} + - EMBED_FOOTER_TEXT=${EMBED_FOOTER_TEXT} + - EMBED_FOOTER_ICON=${EMBED_FOOTER_ICON} + - LOG_LEVEL=${LOG_LEVEL} + - REPUTATION_TIMEOUT=${REPUTATION_TIMEOUT} + - BOT_HOSTER_NAME=${BOT_HOSTER_NAME} + - BOT_HOSTER_URL=${BOT_HOSTER_URL} - NODE_ENV=production stdin_open: true tty: true - mongodb: - image: mongo:4.2.21 - restart: unless-stopped volumes: - - ./logs:/app/build/logs + - ./logs:/app/logs + mongodb: + image: mongo:latest + restart: unless-stopped + environment: + MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} + MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS} + volumes: - ./database:/data/db