From cfad224c8da5eef3a95bd5f6545b57a92f7b76dd Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Thu, 11 May 2023 07:56:32 -0400
Subject: [PATCH] Revert "More paths"

This reverts commit 43dcdf4e6a3eef0595c005e81913cbea416331b6.
---
 .drone.yml                                                | 6 +++---
 docker/Dockerfile => Dockerfile                           | 8 ++++----
 docker/docker-compose.dev.yml => docker-compose.dev.yml   | 0
 ....staging-build.yml => docker-compose.staging-build.yml | 4 ++--
 ....staging-image.yml => docker-compose.staging-image.yml | 0
 .../mongo-init.js => mongo-init.js                        | 1 -
 6 files changed, 9 insertions(+), 10 deletions(-)
 rename docker/Dockerfile => Dockerfile (82%)
 rename docker/docker-compose.dev.yml => docker-compose.dev.yml (100%)
 rename docker/docker-compose.staging-build.yml => docker-compose.staging-build.yml (96%)
 rename docker/docker-compose.staging-image.yml => docker-compose.staging-image.yml (100%)
 rename docker/docker-entrypoint-initdb.d/mongo-init.js => mongo-init.js (84%)

diff --git a/.drone.yml b/.drone.yml
index cb3dc4d..29f578c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -166,8 +166,8 @@ steps:
     ROUTE_PREFIX: /auth
     PORT: 9001
   commands:
-    - docker compose -f /drone/auth/docker/docker-compose.staging-build.yml build --pull --no-cache
-    - docker compose -f /drone/auth/docker/docker-compose.staging-build.yml up --remove-orphans --force-recreate --wait
+    - docker compose -f docker-compose.staging-build.yml build --pull --no-cache
+    - docker compose -f docker-compose.staging-build.yml up --remove-orphans --force-recreate --wait
   volumes:
   - name: env-secrets
     path: /drone/auth/staging.env
@@ -205,7 +205,7 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 - name: mongo-init
-  path: /drone/auth/docker/docker-entrypoint-initdb.d/mongo-init.js
+  path: /drone/auth/mongo-init.js
 
 depends_on:
   - Test Pipeline
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 82%
rename from docker/Dockerfile
rename to Dockerfile
index bbf78d8..4efb832 100644
--- a/docker/Dockerfile
+++ b/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/docker-compose.dev.yml b/docker-compose.dev.yml
similarity index 100%
rename from docker/docker-compose.dev.yml
rename to docker-compose.dev.yml
diff --git a/docker/docker-compose.staging-build.yml b/docker-compose.staging-build.yml
similarity index 96%
rename from docker/docker-compose.staging-build.yml
rename to docker-compose.staging-build.yml
index c466996..0dcfba1 100644
--- a/docker/docker-compose.staging-build.yml
+++ b/docker-compose.staging-build.yml
@@ -4,7 +4,7 @@ services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
         env_file:
-            - ../staging.env
+            - staging.env
         networks:
             - docknet
         volumes:
@@ -15,7 +15,7 @@ services:
         image: mongo:4.4
     auth-service:
         env_file:
-            - ../staging.env
+            - staging.env
         build:
             context: .
             args:
diff --git a/docker/docker-compose.staging-image.yml b/docker-compose.staging-image.yml
similarity index 100%
rename from docker/docker-compose.staging-image.yml
rename to docker-compose.staging-image.yml
diff --git a/docker/docker-entrypoint-initdb.d/mongo-init.js b/mongo-init.js
similarity index 84%
rename from docker/docker-entrypoint-initdb.d/mongo-init.js
rename to mongo-init.js
index 56542b7..edc4dec 100644
--- a/docker/docker-entrypoint-initdb.d/mongo-init.js
+++ b/mongo-init.js
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef */
-db = db.getSiblingDB(process.env.DB_NAME);
 db.createUser({
     user: process.env.DB_USERNAME,
     pwd: process.env.DB_PASSWORD,