Updates to docker-compose and dockerfile

google · Oct 5, 2023 · d0c907a · d0c907a
1 parent c09d923
commit d0c907a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml
@@ -30,7 +30,7 @@ services:
             - TURBINIA_EXTRA_ARGS=${TURBINIA_EXTRA_ARGS}
 
     turbinia-api-server:
-        #image: "turbinia-api-server-dev # Use this for local development and comment out below line
+        #image: "turbinia-api-server-dev" # Use this for local development and comment out below line
         image: "us-docker.pkg.dev/osdfir-registry/turbinia/release/turbinia-api-server:latest" # Latest stable
         container_name: turbinia-api-server
 

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
@@ -104,7 +104,7 @@ WORKDIR /home/turbinia
 COPY --chown=turbinia:turbinia ./pyproject.toml ./poetry.toml ./poetry.lock /home/turbinia/
 
 # Install dependencies using Poetry
-RUN poetry install --no-interaction --no-ansi -E worker -E gcp --with test
+RUN poetry install --no-interaction --no-ansi -E worker -E gcp --with test --no-root
 RUN poetry run python3 -m pip install impacket --no-deps
 
 ENV PATH="/home/turbinia/.venv/bin:$PATH" \
@@ -113,4 +113,7 @@ ENV PATH="/home/turbinia/.venv/bin:$PATH" \
 # Copy the source directory to the container
 COPY --chown=turbinia:turbinia . /home/turbinia/
 
+# Install Turbinia package -- will skip dependencies if installed
+RUN poetry install --no-interaction --no-ansi --sync -E worker -E gcp --with test
+
 CMD ["/bin/bash"]