Skip to content

Update ocs base image to use newly reworked image #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrianJKoopman merged 2 commits into from
Aug 6, 2024
Merged

Update ocs base image to use newly reworked image #714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc241a
Update base image to use new reworked ocs image
BrianJKoopman Aug 2, 2024
e0f69f8
Remove redundant python3-pip install and use virtualenv pip everywhere
BrianJKoopman Aug 2, 2024
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
11 changes: 5 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# A container setup with an installation of socs.

# Use the ocs image as a base
FROM simonsobs/ocs:v0.11.1
FROM simonsobs/ocs:v0.11.1-1-gb6cbd88

# Set up the cryo/smurf user and group so this can run on smurf-servers
# See link for how all other smurf-containers are set up:
Expand All @@ -16,10 +16,9 @@ RUN useradd -d /home/cryo -M cryo -u 1000 && \

# Install packages
# suprsync agent - rsync
# labjack agent - wget, python3-pip, libusb-1.0-0-dev, udev
# labjack agent - wget, libusb-1.0-0-dev, udev
RUN apt-get update && apt-get install -y rsync \
wget \
python3-pip \
libusb-1.0-0-dev \
udev

Expand All @@ -36,14 +35,14 @@ COPY requirements/ /app/socs/requirements
COPY requirements.txt /app/socs/requirements.txt
WORKDIR /app/socs/
# Work around https://github.com/pypa/setuptools/issues/4483/ temporarily
RUN pip3 install -U "setuptools<71.0.0"
RUN pip3 install -r requirements.txt
RUN python -m pip install -U "setuptools<71.0.0"
RUN python -m pip install -r requirements.txt

# Copy the current directory contents into the container at /app
COPY . /app/socs/

# Install socs
RUN pip3 install .
RUN python -m pip install .

# Reset workdir to avoid local imports
WORKDIR /
Expand Down