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.

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

optimize layers in dockerfile #2842

Merged
merged 5 commits into from
Mar 12, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- Update GitHub Actions ([#2827](https://github.com/nf-core/tools/pull/2827))
- Switch to setup-nf-test ([#2834](https://github.com/nf-core/tools/pull/2834))
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.3.2 ([#2836](https://github.com/nf-core/tools/pull/2836))
- optimize layers in dockerfile ([#2842](https://github.com/nf-core/tools/pull/2842))
- Update gitpod/workspace-base Docker digest to 1e133e5 ([#2843](https://github.com/nf-core/tools/pull/2843))

## [v2.13.1 - Tin Puppy Patch](https://github.com/nf-core/tools/releases/tag/2.13) - [2024-02-29]
Expand Down
34 changes: 15 additions & 19 deletions nf_core/gitpod/gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ USER root
# Install util tools.
# software-properties-common is needed to add ppa support for Apptainer installation
RUN apt-get update --quiet && \
apt-get install --quiet --yes \
apt-get install --quiet --yes --no-install-recommends \
mashehu marked this conversation as resolved.
Show resolved Hide resolved
apt-transport-https \
apt-utils \
sudo \
Expand All @@ -18,18 +18,17 @@ RUN apt-get update --quiet && \
curl \
tree \
graphviz \
software-properties-common

# Install Apptainer (Singularity)
RUN add-apt-repository -y ppa:apptainer/ppa && \
software-properties-common && \
add-apt-repository -y ppa:apptainer/ppa && \
apt-get update --quiet && \
apt install -y apptainer

# Install Conda
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
apt-get install --quiet --yes apptainer && \
wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda && \
rm Miniconda3-latest-Linux-x86_64.sh
rm Miniconda3-latest-Linux-x86_64.sh && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Set PATH for Conda
ENV PATH="/opt/conda/bin:$PATH"

# Add the nf-core source files to the image
Expand All @@ -47,23 +46,20 @@ RUN conda config --add channels defaults && \
conda config --add channels conda-forge && \
conda config --set channel_priority strict && \
conda install --quiet --yes --name base \
mamba \
mashehu marked this conversation as resolved.
Show resolved Hide resolved
nextflow \
nf-core \
nf-test \
prettier \
pre-commit \
ruff \
mypy \
openjdk \
pytest-workflow && \
conda clean --all --force-pkgs-dirs --yes

# Update Nextflow
RUN nextflow self-update

# Install nf-core
RUN python -m pip install . --no-cache-dir
# Update Nextflow and Install nf-core
RUN nextflow self-update && \
python -m pip install . --no-cache-dir

# Setup pdiff for nf-test diffs
RUN export NFT_DIFF="pdiff" && \
export NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
ENV NFT_DIFF="pdiff"
ENV NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
Loading