Skip to content

Commit

Permalink
fixup: ensure docker env can still build and run
Browse files Browse the repository at this point in the history
  • Loading branch information
mcous committed Aug 11, 2021
1 parent 273c7fb commit 7b0fd6f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env/
# Generated files for local API server config paths
api/.env
api/index.json
.opentrons_config

# MyPy caches
.mypy_cache
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu as base
RUN apt-get update && apt-get install -y python3 pip
ENV TZ=Etc/UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get update && apt-get install --yes python3 pip pkg-config libsystemd-dev

FROM base as builder
COPY scripts scripts
Expand All @@ -26,4 +28,4 @@ RUN cd robot-server && python3 setup.py bdist_wheel -d /dist/

FROM base
COPY --from=builder /dist /dist
RUN pip install /dist/*
RUN pip install /dist/*
2 changes: 1 addition & 1 deletion robot-server/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ colorama = {version="0.4.4", sys_platform="== 'win32'"}

[packages]
opentrons = {editable = true, path = "../api"}
opentrons-notify-server = {editable = true, path = "../notify-server"}
opentrons-shared-data = {editable = true, path = "../shared-data/python"}
notify-server = {editable = true, path = "../notify-server"}
anyio = "==3.3.0"
fastapi = "==0.54.1"
python-dotenv = "==0.19.0"
Expand Down
4 changes: 2 additions & 2 deletions robot-server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_version():

VERSION = get_version()

DISTNAME = "robotserver"
DISTNAME = "robot_server"
LICENSE = "Apache 2.0"
AUTHOR = "Opentrons"
EMAIL = "[email protected]"
Expand All @@ -51,8 +51,8 @@ def get_version():
PACKAGES = find_packages(where=".", exclude=["tests.*", "tests"])
INSTALL_REQUIRES = [
f"opentrons=={VERSION}",
f"opentrons-notify-server=={VERSION}",
f"opentrons-shared-data=={VERSION}",
f"notify-server=={VERSION}",
"anyio==3.3.0",
"fastapi==0.54.1",
"python-dotenv==0.19.0",
Expand Down

0 comments on commit 7b0fd6f

Please sign in to comment.