One more attempt

Oneirocom · Feb 12, 2024 · d687516 · d687516
1 parent 2c98627
commit d687516
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,4 +6,7 @@ bruno-requests
 tmp
 apps/docs
 apps/client
-packages/client
+packages/client
+portal
+.git
+.gitmodules
diff --git a/scripts/Dockerfile.manager b/scripts/Dockerfile.manager
@@ -1,20 +1,19 @@
 FROM magickml/magick:latest
 
 ARG GITHUB_TOKEN
+ARG PORTAL_BRANCH=main
 
-COPY ./.gitmodules /app/.gitmodules
 COPY . /app
 WORKDIR /app
 
 # make this folder into a git repository so we can install submodules
 RUN git init
 # Configure git to use the token
 RUN git config --global url."https://${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
-RUN git submodule add -b ${SUBMODULE_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git ./portal/cloud
-
+RUN git submodule add -b ${PORTAL_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git portal/cloud
 
 # Clone the submodule
-RUN git submodule update --init --recursive
+RUN git submodule update --init --recursive portal/cloud
 
 RUN poetry install --no-interaction --no-ansi -vvv
 # RUN poetry install --no-root

diff --git a/scripts/Dockerfile.server b/scripts/Dockerfile.server
@@ -10,11 +10,10 @@ WORKDIR /app
 RUN git init
 # Configure git to use the token
 RUN git config --global url."https://${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
-RUN git submodule add -b ${SUBMODULE_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git ./portal/cloud
-
+RUN git submodule add -b ${PORTAL_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git portal/cloud
 
 # Clone the submodule
-RUN git submodule update --init --recursive
+RUN git submodule update --init --recursive portal/cloud
 
 RUN poetry install --no-interaction --no-ansi -vvv
 # RUN poetry install --no-root

diff --git a/scripts/Dockerfile.worker b/scripts/Dockerfile.worker
@@ -12,10 +12,10 @@ RUN git init
 
 # Configure git to use the token
 RUN git config --global url."https://${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
-RUN git submodule add -b ${SUBMODULE_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git ./portal/cloud
+RUN git submodule add -b ${PORTAL_BRANCH} https://${GITHUB_TOKEN}@github.com/oneirocom/portal.git portal/cloud
 
 # Clone the submodule
-RUN git submodule update --init --recursive
+RUN git submodule update --init --recursive portal/cloud
 
 RUN poetry install --no-interaction --no-ansi -vvv
 # RUN poetry install --no-root