From 912aa470a5bac5a4f4dbc95d8e95c8299bc9cff9 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Wed, 13 Sep 2023 21:24:38 +0200
Subject: [PATCH] fix dockerfile for usage of dlt-database

---
 dlt-connector/Dockerfile   | 14 ++++++++++++--
 dlt-connector/package.json |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlt-connector/Dockerfile b/dlt-connector/Dockerfile
index 6e5e628f7..eadbba980 100644
--- a/dlt-connector/Dockerfile
+++ b/dlt-connector/Dockerfile
@@ -44,6 +44,7 @@ EXPOSE ${PORT}
 RUN mkdir -p ${DOCKER_WORKDIR}
 WORKDIR ${DOCKER_WORKDIR}
 
+RUN mkdir -p /dlt-database
 
 ##################################################################################
 # DEVELOPMENT (Connected to the local environment, to reload on demand) ##########
@@ -56,7 +57,7 @@ FROM base as development
 # Run command
 # (for development we need to execute yarn install since the
 #  node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /dlt-database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
 
 ##################################################################################
 # BUILD (Does contain all files and is therefore bloated) ########################
@@ -65,13 +66,21 @@ FROM base as build
 
 # Copy everything from dlt-connector
 COPY ./dlt-connector/ ./
+# Copy everything from dlt-database
+COPY ./dlt-database/ ../dlt-database/
 
 # yarn install dlt-connector
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 
+# yarn install dlt-database
+RUN cd ../dlt-database && yarn install --production=false --frozen-lockfile --non-interactive
+
 # yarn build
 RUN yarn run build
 
+# yarn build dlt-database
+RUN cd ../dlt-database && yarn run build
+
 ##################################################################################
 # TEST ###########################################################################
 ##################################################################################
@@ -90,9 +99,10 @@ RUN apk del rust cargo python3 make g++
 
 # Copy "binary"-files from build image
 COPY --from=build ${DOCKER_WORKDIR}/build ./build
-
+COPY --from=build ${DOCKER_WORKDIR}/../dlt-database/build ../dlt-database/build
 # We also copy the node_modules express and serve-static for the run script
 COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+COPY --from=build ${DOCKER_WORKDIR}/../dlt-database/node_modules ../dlt-database/node_modules
 # Copy static files
 # COPY --from=build ${DOCKER_WORKDIR}/public ./public
 # Copy package.json for script definitions (lock file should not be needed)
diff --git a/dlt-connector/package.json b/dlt-connector/package.json
index 56c1e581c..7d318f49c 100644
--- a/dlt-connector/package.json
+++ b/dlt-connector/package.json
@@ -25,6 +25,7 @@
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "decimal.js-light": "^2.5.1",
+    "dlt-database": "file:../dlt-database",
     "dotenv": "10.0.0",
     "express": "4.17.1",
     "graphql": "^16.7.1",