Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/postgres-database/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,5 @@ COPY entrypoint.bash /home/entrypoint.bash

RUN chmod +x /home/entrypoint.bash

ENV POSTGRES_USER=scu \
POSTGRES_PASSWORD=adminadmin \
POSTGRES_HOST=postgres \
POSTGRES_PORT=5432 \
POSTGRES_DB=simcoredb

ENTRYPOINT [ "/bin/bash", "/home/entrypoint.bash" ]
CMD [ "sc-pg", "upgrade" ]
2 changes: 1 addition & 1 deletion services/dask-sidecar/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG PYTHON_VERSION="3.11.9"
ARG UV_VERSION="0.7"
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
# we docker image is built based on debian
FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm AS base
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
Expand Down
9 changes: 1 addition & 8 deletions services/migration/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,7 @@ FROM base AS production

ENV PYTHONOPTIMIZE=TRUE

# testing defaults
ENV POSTGRES_USER=scu \
POSTGRES_PASSWORD=adminadmin \
POSTGRES_HOST=postgres \
POSTGRES_PORT=5432 \
POSTGRES_DB=simcoredb \
SC_DONE_MARK_FILE=migration.done

ENV SC_DONE_MARK_FILE=migration.done

WORKDIR /home/scu

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ FROM server-base AS production
COPY --from=build-client \
--chown=${SC_USER_NAME}:${SC_USER_NAME} \
/project/build-output "/static-content"
ENV SC_BUILD_TARGET production
ENV SC_BUILD_TARGET=production

FROM server-base AS development
ENV SC_BUILD_TARGET development
ENV SC_BUILD_TARGET=development
6 changes: 3 additions & 3 deletions services/storage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
ENV PATH="${VIRTUAL_ENV}/bin:$PATH"


ENV SC_BUILD_TARGET base
ENV SC_BOOT_MODE default
ENV SC_BUILD_TARGET=base
ENV SC_BOOT_MODE=default

EXPOSE 8080
# -------------------------- -------------------------------
Expand All @@ -81,7 +81,7 @@ EXPOSE 8080

FROM base AS build

ENV SC_BUILD_TARGET build
ENV SC_BUILD_TARGET=build

RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
set -eux \
Expand Down
6 changes: 3 additions & 3 deletions services/web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV PATH="${VIRTUAL_ENV}/bin:$PATH"


# TODO: eliminate this variable!
ENV IS_CONTAINER_CONTEXT Yes
ENV IS_CONTAINER_CONTEXT=Yes


EXPOSE 8080
Expand All @@ -93,7 +93,7 @@ EXPOSE 8080

FROM base AS build

ENV SC_BUILD_TARGET build
ENV SC_BUILD_TARGET=build

RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
set -eux \
Expand Down Expand Up @@ -206,7 +206,7 @@ CMD ["services/web/server/docker/boot.sh"]
#
FROM build AS development

ENV SC_BUILD_TARGET development
ENV SC_BUILD_TARGET=development

WORKDIR /devel

Expand Down
Loading