chore(*): prod and env handling

* composed .env files
* split Dockerfile and compose files
* start script based on env

Author: almostSouji

.gitignore

@@ -1,5 +1,5 @@
 # secrets
-.env
+*.env
 
 # build flow
 dist/
@@ -9,4 +9,4 @@ node_modules/
 .DS_Store
 .yarn/*
 !.yarn/releases
-!.yarn/patches
+!.yarn/patches

DevDockerfile

@@ -0,0 +1,10 @@
+FROM node:20-alpine
+LABEL name "slash-utils"
+LABEL version "0.0.0"
+LABEL maintainer "almostSouji <https://github.com/almostSouji>"
+ENV FORCE_COLOR=1
+WORKDIR /usr/slash-utils
+COPY package.json ./
+COPY . .
+RUN yarn build
+CMD ["yarn", "start"]

Dockerfile

@@ -7,4 +7,4 @@ WORKDIR /usr/slash-utils
 COPY package.json ./
 COPY . .
 RUN yarn build
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

compose.dev.yml

@@ -1,4 +1,17 @@
+version: '3'
+
 services:
   application:
+    build:
+      context: ./
+      dockerfile: dev.Dockerfile
+    restart: always
+    env_file:
+      - ./.env
+      - ./.dev.env
     ports:
       - '49202:49666'
+    volumes:
+      - type: bind
+        source: ./tags
+        target: /usr/slash-utils/tags

dev.Dockerfile

@@ -0,0 +1,10 @@
+FROM node:20-alpine
+LABEL name "slash-utils-dev"
+LABEL version "0.0.0"
+LABEL maintainer "almostSouji <https://github.com/almostSouji>"
+ENV FORCE_COLOR=1
+WORKDIR /usr/slash-utils
+COPY package.json ./
+COPY . .
+RUN yarn build
+CMD ["yarn", "start"]

package.json

@@ -8,8 +8,10 @@
 		"lint": "eslint src --ext .ts",
 		"lint:fix": "eslint src --ext .ts --fix",
 		"prettier": "prettier --write **/*.{ts,js,toml}",
-		"cmd:glob": "env-cmd node dist/deployFunctions/deployGlobal.js",
-		"cmd:dev": "env-cmd node dist/deployFunctions/deployDev.js",
+		"deploy:glob": "env-cmd node dist/deployFunctions/deployGlobal.js --env-file=.env",
+		"deploy:dev": "env-cmd node dist/deployFunctions/deployDev.js --env-file=.env",
+		"deploy-dev:glob": "env-cmd node dist/deployFunctions/deployGlobal.js --env-file=.env --env-file=.dev.env",
+		"deploy-dev:dev": "env-cmd node dist/deployFunctions/deployDev.js --env-file=.env --env-file=.dev.env",
 		"validate-tags": "node dist/workflowFunctions/validateTagsWithoutLinks.js",
 		"validate-tags:withlinks": "node dist/workflowFunctions/validateTagsWithLinks.js",
 		"prepare": "is-ci || husky install"
@@ -37,7 +39,6 @@
 		"cheerio": "^1.0.0-rc.12",
 		"cloudflare": "^4.2.0",
 		"discord-api-types": "^0.37.83",
-		"dotenv": "^16.3.1",
 		"he": "^1.2.0",
 		"html-entities": "^2.4.0",
 		"kleur": "^4.1.5",

src/deployFunctions/deploy.ts

@@ -1,14 +1,9 @@
-import { resolve, dirname } from 'node:path';
 import process from 'node:process';
-import { fileURLToPath } from 'node:url';
-import { config } from 'dotenv';
 import { fetch } from 'undici';
 import { API_BASE_DISCORD } from '../util/constants.js';
 import { logger } from '../util/logger.js';
 import { PreReleaseApplicationCommandContextType, PreReleaseApplicationIntegrationType } from './auxtypes.js';
 
-config({ path: resolve(dirname(fileURLToPath(import.meta.url)), '../../.env') });
-
 export async function deploy(data: any, dev = false) {
 	const midRoute = dev ? `/guilds/${process.env.DISCORD_DEVGUILD_ID!}` : '';
 	const route = `${API_BASE_DISCORD}/applications/${process.env.DISCORD_CLIENT_ID!}${midRoute}/commands`;

start.sh

@@ -0,0 +1,7 @@
+#! /bin/bash
+
+if [ "$ENV" = "dev" ]; then
+	podman-compose -p discord-utils-bot-dev down && podman-compose -f ./compose.dev.yml -p discord-utils-bot-dev up --build
+else
+	podman-compose -p discord-utils-bot down && podman-compose -f ./compose.yml -p discord-utils-bot up --build
+fi

yarn.lock

@@ -2717,13 +2717,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:^16.3.1":
-  version: 16.4.5
-  resolution: "dotenv@npm:16.4.5"
-  checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c
-  languageName: node
-  linkType: hard
-
 "dunder-proto@npm:^1.0.1":
   version: 1.0.1
   resolution: "dunder-proto@npm:1.0.1"
@@ -7142,7 +7135,6 @@ __metadata:
     cheerio: ^1.0.0-rc.12
     cloudflare: ^4.2.0
     discord-api-types: ^0.37.83
-    dotenv: ^16.3.1
     env-cmd: ^10.1.0
     eslint: ^8.48.0
     eslint-config-neon: 0.1.54