From 65ff23e40699b313c3d63c44366f5d54a3cca589 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Wed, 10 May 2023 20:04:27 -0400
Subject: [PATCH] Shouldn't matter... directory structure

---
 .drone.yml                                                | 2 +-
 Dockerfile => docker/Dockerfile                           | 8 ++++----
 docker-compose.dev.yml => docker/docker-compose.dev.yml   | 0
 .../docker-compose.staging-build.yml                      | 0
 .../docker-compose.staging-image.yml                      | 0
 .../docker-entrypoint-initdb.d/mongo-init.js              | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename Dockerfile => docker/Dockerfile (82%)
 rename docker-compose.dev.yml => docker/docker-compose.dev.yml (100%)
 rename docker-compose.staging-build.yml => docker/docker-compose.staging-build.yml (100%)
 rename docker-compose.staging-image.yml => docker/docker-compose.staging-image.yml (100%)
 rename mongo-init.js => docker/docker-entrypoint-initdb.d/mongo-init.js (84%)

diff --git a/.drone.yml b/.drone.yml
index 29f578c..742f21e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -205,7 +205,7 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 - name: mongo-init
-  path: /drone/auth/mongo-init.js
+  path: /drone/auth/docker/docker-entrypoint-initdb.d/mongo-init.js
 
 depends_on:
   - Test Pipeline
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 82%
rename from Dockerfile
rename to docker/Dockerfile
index 4efb832..bbf78d8 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -2,9 +2,9 @@
 FROM node:20-alpine AS build
 ENV NODE_ENV development
 WORKDIR /home/node/app
-COPY package*.json ./
-COPY tsconfig.json ./
-COPY lib ./lib
+COPY ../package*.json ./
+COPY ../tsconfig.json ./
+COPY ../lib ./lib
 RUN ls -a
 RUN yarn install
 RUN yarn build
@@ -13,7 +13,7 @@ RUN yarn build
 FROM node:20-alpine AS auth-service
 ENV NODE_ENV ${ENV:-production}
 WORKDIR /home/node/app
-COPY package*.json ./
+COPY ../package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
 EXPOSE ${PORT:-9001}
diff --git a/docker-compose.dev.yml b/docker/docker-compose.dev.yml
similarity index 100%
rename from docker-compose.dev.yml
rename to docker/docker-compose.dev.yml
diff --git a/docker-compose.staging-build.yml b/docker/docker-compose.staging-build.yml
similarity index 100%
rename from docker-compose.staging-build.yml
rename to docker/docker-compose.staging-build.yml
diff --git a/docker-compose.staging-image.yml b/docker/docker-compose.staging-image.yml
similarity index 100%
rename from docker-compose.staging-image.yml
rename to docker/docker-compose.staging-image.yml
diff --git a/mongo-init.js b/docker/docker-entrypoint-initdb.d/mongo-init.js
similarity index 84%
rename from mongo-init.js
rename to docker/docker-entrypoint-initdb.d/mongo-init.js
index edc4dec..56542b7 100644
--- a/mongo-init.js
+++ b/docker/docker-entrypoint-initdb.d/mongo-init.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-undef */
+db = db.getSiblingDB(process.env.DB_NAME);
 db.createUser({
     user: process.env.DB_USERNAME,
     pwd: process.env.DB_PASSWORD,