Skip to content
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

Jump to bottom

Dcmcand optimize docker files #625

Merged
merged 24 commits into from
Oct 18, 2023
Merged

Dcmcand optimize docker files #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4bf0350
update Dockerfiles
dcmcand Oct 12, 2023
750f3dc
optimize docker files for build speed and size
dcmcand Oct 13, 2023
7f60382
update dockerfile
dcmcand Oct 16, 2023
c576b8a
Merge branch 'main' into dcmcand-update-conda-store-dockerfile
dcmcand Oct 16, 2023
2b431cb
make sure user owns /opt/conda
dcmcand Oct 16, 2023
d74f28c
update to use released package for release docker image
dcmcand Oct 16, 2023
1e82876
lint
dcmcand Oct 16, 2023
9ceeadb
update tests workflow
dcmcand Oct 16, 2023
7d1f8fd
update docker-compose to add target
dcmcand Oct 16, 2023
7343945
lint
dcmcand Oct 16, 2023
120833c
Merge branch 'main' into dcmcand-optimize-docker-files
dcmcand Oct 16, 2023
6707fb6
Merge branch 'dcmcand-update-conda-store-dockerfile' into dcmcand-opt…
dcmcand Oct 16, 2023
67d0152
Merge branch 'main' into dcmcand-optimize-docker-files
dcmcand Oct 16, 2023
324b1a9
update dockerfile
dcmcand Oct 16, 2023
28bd425
use apt-cache
dcmcand Oct 16, 2023
36e0a3e
update dockerfile
dcmcand Oct 16, 2023
a5311c4
update dockerfile
dcmcand Oct 17, 2023
7e3a68c
remove tests from prod build
dcmcand Oct 17, 2023
77aa244
lint
dcmcand Oct 17, 2023
10a96ef
add permission
dcmcand Oct 17, 2023
b36f438
add fileter for release workflow
dcmcand Oct 17, 2023
5c1f528
remove depreciated tag and set TZ to UTC
dcmcand Oct 17, 2023
eb09fb6
Update conda-store-server/Dockerfile
dcmcand Oct 17, 2023
de5de83
Merge branch 'main' into dcmcand-optimize-docker-files
dcmcand Oct 18, 2023
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
10 changes: 6 additions & 4 deletions conda-store-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM --platform=linux/amd64 condaforge/mambaforge:23.3.1-1 as base
FROM condaforge/mambaforge:23.3.1-1 as base

LABEL org.opencontainers.image.authors="conda-store development team"

ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store-server/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}
ENV TZ=America/New_York
ENV TZ=Etc/UTC

RUN apt-get update && \

Check warning on line 8 in conda-store-server/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store-server) 

Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`
# https://docs.anaconda.org/anaconda/install/linux/#installing-on-linux
apt-get install -yq --no-install-recommends \
libgl1-mesa-glx \
Expand Down Expand Up @@ -41,7 +41,8 @@

COPY environment.yaml /opt/conda-store-server/environment.yaml

RUN mamba env create -f /opt/conda-store-server/environment.yaml
RUN mamba env create -f /opt/conda-store-server/environment.yaml && \
conda clean --force-pkgs-dirs

COPY ./ /opt/conda-store-server/

Expand All @@ -51,14 +52,15 @@

FROM base as prod
ARG RELEASE_VERSION
RUN cd /opt/conda-store-server && \

Check warning on line 55 in conda-store-server/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store-server) 

Use WORKDIR to switch to a directory
/opt/conda/envs/conda-store-server/bin/pip install conda-store-server==${RELEASE_VERSION}
/opt/conda/envs/conda-store-server/bin/pip install conda-store-server==${RELEASE_VERSION} && \
rm -rf /opt/conda-store-server/tests

WORKDIR /var/lib/conda-store

FROM base as dev

RUN cd /opt/conda-store-server && \

Check warning on line 63 in conda-store-server/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store-server) 

Use WORKDIR to switch to a directory
/opt/conda/envs/conda-store-server/bin/pip install -e .

WORKDIR /var/lib/conda-store
10 changes: 6 additions & 4 deletions conda-store/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM --platform=linux/amd64 condaforge/mambaforge:23.3.1-1 as base
FROM condaforge/mambaforge:23.3.1-1 as base

LABEL org.opencontainers.image.authors="conda-store development team"

RUN apt-get update && \

Check warning on line 5 in conda-store/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store) 

Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`
apt-get install -yq --no-install-recommends curl && \
apt-get clean && \
rm -rf /var/cache/apt/* &&\
Expand All @@ -15,7 +15,9 @@

COPY environment.yaml /opt/conda-store/environment.yaml

RUN mamba env create -f /opt/conda-store/environment.yaml
RUN mamba env create -f /opt/conda-store/environment.yaml && \
mamba clean --all -y && \
conda clean --force-pkgs-dirs

ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}

Expand All @@ -23,13 +25,13 @@

FROM base as prod
ARG RELEASE_VERSION
RUN cd /opt/conda-store && \

Check warning on line 28 in conda-store/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store) 

Use WORKDIR to switch to a directory

Check warning on line 28 in conda-store/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store) 

Avoid use of cache directory with pip. Use `pip install --no-cache-dir <package>`
pip install conda-store==${RELEASE_VERSION}
USER conda-store
WORKDIR /opt/jupyterhub

FROM base as dev
RUN cd /opt/conda-store && \
pip install -e .
RUN --mount=type=cache,target=/root/.cache/pip cd /opt/conda-store && \

Check warning on line 34 in conda-store/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store) 

Avoid use of cache directory with pip. Use `pip install --no-cache-dir <package>`

Check warning on line 34 in conda-store/Dockerfile

View workflow job for this annotation

GitHub Actions / Build docker images (conda-store) 

Use WORKDIR to switch to a directory
pip install -e . --no-cache
USER conda-store
WORKDIR /opt/jupyterhub
Loading