Merge pull request #13 from bento-platform/fix-dev-image

Fix development image & update base images

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.02.27
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.03.22
 
 # Use uvicorn (instead of hypercorn) in production since I've found
 # multiple benchmarks showing it to be faster - David L
@@ -19,13 +19,11 @@ RUN poetry install --without dev --no-root
 # Manually copy only what's relevant
 # (Don't use .dockerignore, which allows us to have development containers too)
 COPY bento_service_registry bento_service_registry
-COPY entrypoint.bash .
 COPY run.bash .
 COPY LICENSE .
 COPY README.md .
 
 # Install the module itself, locally (similar to `pip install -e .`)
 RUN poetry install --without dev
 
-ENTRYPOINT [ "/bin/bash", "./entrypoint.bash" ]
 CMD [ "/bin/bash", "./run.bash" ]

dev.Dockerfile

@@ -1,9 +1,6 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.02.27
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.03.22
 
-SHELL ["/bin/bash", "-c"]
-
-RUN source /env/bin/activate && \
-    pip install --no-cache-dir "uvicorn[standard]==0.20.0"
+RUN pip install --no-cache-dir "uvicorn[standard]==0.20.0"
 
 # Backwards-compatible with old BentoV2 container layout
 WORKDIR /service-registry
@@ -15,12 +12,10 @@ COPY poetry.lock .
 # Install production + development dependencies
 # Without --no-root, we get errors related to the code not being copied in yet.
 # But we don't want the code here, otherwise Docker cache doesn't work well.
-RUN source /env/bin/activate && poetry install --no-root
+RUN poetry install --no-root
 
 # Copy entrypoint and runner script in, so we have something to start with - even though it'll get
 # overwritten by volume mount.
-COPY entrypoint.bash .
 COPY run.dev.bash .
 
-ENTRYPOINT [ "/bin/bash", "./entrypoint.bash" ]
 CMD [ "/bin/bash", "./run.dev.bash" ]

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "bento_service_registry"
-version = "0.11.1"
+version = "0.11.2"
 description = "An implementation of GA4GH Service Registry API for the Bento platform."
 authors = ["David Lougheed <[email protected]>"]
 readme = "README.md"

run.bash

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-if [[ -z "${INTERNAL_PORT}" ]]; then
-  # Set default internal port to 5000
-  INTERNAL_PORT=5000
-fi
+# Set default internal port to 5000
+: "${INTERNAL_PORT:=5000}"
 
 uvicorn bento_service_registry.app:application \
   --workers 1 \

run.dev.bash

@@ -1,15 +1,17 @@
 #!/bin/bash
 
-# Set .gitconfig for development
-/set_gitconfig.bash
+# Update dependencies and install module locally
+/poetry_user_install_dev.bash
 
-export QUART_ENV=development
-export QUART_APP=bento_service_registry.app:application
+export QUART_ENV='development'
+export QUART_APP='bento_service_registry.app:application'
 
-if [[ -z "${INTERNAL_PORT}" ]]; then
-  # Set default internal port to 5000
-  export INTERNAL_PORT=5000
-fi
+# Set default internal port to 5000
+: "${INTERNAL_PORT:=5000}"
 
-python -m poetry install
-python -m debugpy --listen 0.0.0.0:5678 -m quart run --host 0.0.0.0 --port "${INTERNAL_PORT}"
+# Set default debugger port to debugpy default
+: "${DEBUGGER_PORT:=5678}"
+
+python -m debugpy --listen "0.0.0.0:${DEBUGGER_PORT}" -m quart run \
+  --host 0.0.0.0 \
+  --port "${INTERNAL_PORT}"