From e3189cec98eddae1bb088e3142855bdef0206c9c Mon Sep 17 00:00:00 2001
From: Wesley Parr <wesley@diba.io>
Date: Sat, 29 Jul 2023 22:13:54 +0000
Subject: [PATCH 1/5] dockerfile test -v -v

---
 docker/bitmask/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/bitmask/Dockerfile b/docker/bitmask/Dockerfile
index 25b2b7dd..f3d49011 100644
--- a/docker/bitmask/Dockerfile
+++ b/docker/bitmask/Dockerfile
@@ -17,7 +17,9 @@ FROM rust:1.70-slim-buster AS runtime
 
 ARG BUILDER_DIR=/srv/bitmask
 ARG BIN_DIR=/usr/local/bin
-ARG DATA_DIR=/tmp/bitmaskd/carbonado/
+#ARG BIN_DIR=/app .... this didn;t work bitmaskd not found
+#ARG DATA_DIR=/tmp/bitmaskd/carbonado/
+ARG DATA_DIR=/data
 ARG USER=bitmask
 
 RUN apt-get update -y && apt-get install -y iputils-ping telnet \
@@ -30,7 +32,9 @@ COPY --from=builder --chown=${USER}:${USER} \
      "${BUILDER_DIR}/bin/" "${BIN_DIR}"
 
 USER ${USER}
-VOLUME ${DATA_DIR}
+RUN chown -R bitmask:bitmask /data
+
+VOLUME /_data
 EXPOSE 7070
 
 WORKDIR ${BIN_DIR}

From 18bc0cb500e50f9fcda651451df68be97354cd5a Mon Sep 17 00:00:00 2001
From: Wesley Parr <wesley@diba.io>
Date: Sat, 29 Jul 2023 22:27:53 +0000
Subject: [PATCH 2/5] docker test -v -v

---
 docker/bitmask/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/bitmask/Dockerfile b/docker/bitmask/Dockerfile
index f3d49011..20507a18 100644
--- a/docker/bitmask/Dockerfile
+++ b/docker/bitmask/Dockerfile
@@ -17,8 +17,6 @@ FROM rust:1.70-slim-buster AS runtime
 
 ARG BUILDER_DIR=/srv/bitmask
 ARG BIN_DIR=/usr/local/bin
-#ARG BIN_DIR=/app .... this didn;t work bitmaskd not found
-#ARG DATA_DIR=/tmp/bitmaskd/carbonado/
 ARG DATA_DIR=/data
 ARG USER=bitmask
 

From e6d2678fc62131af70d09db2c493ddc7a3f6b92c Mon Sep 17 00:00:00 2001
From: Wesley Parr <wesley@diba.io>
Date: Tue, 1 Aug 2023 00:43:53 +0000
Subject: [PATCH 3/5] docker --mount to storage

---
 docker/bitmask/Dockerfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker/bitmask/Dockerfile b/docker/bitmask/Dockerfile
index 20507a18..d06048ef 100644
--- a/docker/bitmask/Dockerfile
+++ b/docker/bitmask/Dockerfile
@@ -1,5 +1,5 @@
-# Builder
-FROM rust:1.70-slim-buster AS builder
+#Buildere
+FROM rust:1.69-slim-buster AS builder
 ARG BUILDER_DIR=/srv/bitmask
 ARG BUILDER_SRC=/opt/src/bitmask
 
@@ -12,12 +12,15 @@ COPY . .
 
 RUN cargo install --locked --features server --path . --root ${BUILDER_DIR}
 
+# Set the working directory inside the container
+#WORKDIR /app
+
 # Runtime
-FROM rust:1.70-slim-buster AS runtime
+FROM rust:1.69-slim-buster AS runtime
 
 ARG BUILDER_DIR=/srv/bitmask
 ARG BIN_DIR=/usr/local/bin
-ARG DATA_DIR=/data
+ARG DATA_DIR=/data/bitmaskd/carbonado/
 ARG USER=bitmask
 
 RUN apt-get update -y && apt-get install -y iputils-ping telnet \
@@ -30,11 +33,10 @@ COPY --from=builder --chown=${USER}:${USER} \
      "${BUILDER_DIR}/bin/" "${BIN_DIR}"
 
 USER ${USER}
-RUN chown -R bitmask:bitmask /data
-
-VOLUME /_data
+VOLUME ${DATA_DIR}
 EXPOSE 7070
 
+# Set the data directory for data persistence
 WORKDIR ${BIN_DIR}
 
 ENTRYPOINT ["bitmaskd"]

From 8b4c1a904b48ca4b9f9555abe13ae1ba4d2fa4e7 Mon Sep 17 00:00:00 2001
From: Wesley Parr <wesley@diba.io>
Date: Wed, 2 Aug 2023 19:55:57 +0000
Subject: [PATCH 4/5] ENV CARBONADO_DIR to /data/bitmaskd/carbonado/

---
 docker/bitmask/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/bitmask/Dockerfile b/docker/bitmask/Dockerfile
index d06048ef..1bfd9210 100644
--- a/docker/bitmask/Dockerfile
+++ b/docker/bitmask/Dockerfile
@@ -12,8 +12,7 @@ COPY . .
 
 RUN cargo install --locked --features server --path . --root ${BUILDER_DIR}
 
-# Set the working directory inside the container
-#WORKDIR /app
+ENV CARBONADO_DIR= "/data/bitmaskd/carbonado/"
 
 # Runtime
 FROM rust:1.69-slim-buster AS runtime

From 08fcef3d9dc98209fb1440c2dba5da5ac75b78e2 Mon Sep 17 00:00:00 2001
From: Wesley Parr <wesley@diba.io>
Date: Thu, 3 Aug 2023 01:06:19 +0000
Subject: [PATCH 5/5] dockerfile CARBONADO_DIR mv to runtime

---
 docker/bitmask/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/bitmask/Dockerfile b/docker/bitmask/Dockerfile
index 1bfd9210..c5814b03 100644
--- a/docker/bitmask/Dockerfile
+++ b/docker/bitmask/Dockerfile
@@ -1,4 +1,4 @@
-#Buildere
+# Builder
 FROM rust:1.69-slim-buster AS builder
 ARG BUILDER_DIR=/srv/bitmask
 ARG BUILDER_SRC=/opt/src/bitmask
@@ -12,14 +12,18 @@ COPY . .
 
 RUN cargo install --locked --features server --path . --root ${BUILDER_DIR}
 
-ENV CARBONADO_DIR= "/data/bitmaskd/carbonado/"
+#ARG path
+#ENV  CARBONADO_DIR $path
+#ENV CARBONADO_DIR=/data/bitmaskd/carbonado/
 
 # Runtime
 FROM rust:1.69-slim-buster AS runtime
 
+ENV CARBONADO_DIR=/data/bitmaskd/carbonado/
+
 ARG BUILDER_DIR=/srv/bitmask
 ARG BIN_DIR=/usr/local/bin
-ARG DATA_DIR=/data/bitmaskd/carbonado/
+ARG DATA_DIR=/tmp/bitmaskd/carbonado/
 ARG USER=bitmask
 
 RUN apt-get update -y && apt-get install -y iputils-ping telnet \
@@ -35,7 +39,6 @@ USER ${USER}
 VOLUME ${DATA_DIR}
 EXPOSE 7070
 
-# Set the data directory for data persistence
 WORKDIR ${BIN_DIR}
 
 ENTRYPOINT ["bitmaskd"]