+
Skip to content

Issues/3466 Move away from Gitpod #3569

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

Draft
wants to merge 50 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
80b0182
Renaming Dockerfile and location. Changing to building the Dockerfile…
JulianFlesch May 14, 2025
7a8cebd
change Container user. Change base Image for devcontainer
JulianFlesch May 14, 2025
5fd706a
Remove installation of apptainer via apt-get because of 404 from ppa
JulianFlesch May 14, 2025
0d6e6a5
Create unprivileged user
JulianFlesch May 14, 2025
be2996e
Change git workflow for container creation and use the correct contai…
JulianFlesch May 14, 2025
53dd172
Update instruction to build locally for testing
JulianFlesch May 14, 2025
dd6ddc3
[automated] Update CHANGELOG.md
nf-core-bot May 14, 2025
0c3a21d
Merge branch 'issues/3466-gitpod' of github.com:JulianFlesch/nf-core-…
JulianFlesch May 14, 2025
464d3bd
More descriptive changelog entry
JulianFlesch May 14, 2025
2ee5fc1
Change base Image
JulianFlesch May 20, 2025
776b2c8
Change back to using gitpod user
JulianFlesch May 20, 2025
a5c6644
Remove comment
JulianFlesch May 20, 2025
c77a469
WIP: build container locally instead of pulling. Change to gitpod use…
JulianFlesch May 20, 2025
36e5f7a
Rename pushed container to nf-core/devcontainer
JulianFlesch May 20, 2025
4f8a2c0
Remove gitpod.yml from template
JulianFlesch May 20, 2025
c225114
Remove .gitpod.yml
JulianFlesch May 20, 2025
56962f2
Merge branch 'dev' into issues/3466-gitpod
JulianFlesch May 20, 2025
f525657
Remove local container building
JulianFlesch May 20, 2025
e0e6d97
Change base image tag
JulianFlesch May 20, 2025
923d99d
re-add comments
JulianFlesch May 20, 2025
b5e7487
Add latest tag explicitly
JulianFlesch May 20, 2025
8785edb
Test seqera container base image
JulianFlesch May 20, 2025
cccb21c
update comments. todo
JulianFlesch May 20, 2025
774b4cd
Rename to reflect base image
JulianFlesch May 20, 2025
0091a34
WIP: devcontainer with docker-in-docker feature
JulianFlesch May 20, 2025
875d661
Add seqera url as comment
JulianFlesch May 20, 2025
6a2c92d
Overwrite base image entrypoint. Add non-privileged user.
JulianFlesch May 27, 2025
77a8357
Clean up
JulianFlesch May 27, 2025
0aa49b3
Make user privileged when running container
JulianFlesch May 27, 2025
e9fa6df
Change to non-root user 'vscode' from base image. Try running without…
JulianFlesch May 27, 2025
552b0ff
Run privileged
JulianFlesch May 27, 2025
dd021d0
Change nf-core install to have dev dependencies and --editable set
JulianFlesch May 27, 2025
64e86d5
Install pre-commit hooks in image
JulianFlesch May 27, 2025
9eda307
Remove redundant post-create installation of nf-core and pre-commit h…
JulianFlesch May 27, 2025
d0fea24
Remove postCreateCommand. Remove Privileged
JulianFlesch May 27, 2025
d974952
Fix pre-commit install cmd
JulianFlesch May 27, 2025
3216521
Remove more redundant conda packages
JulianFlesch May 27, 2025
e400076
Chown nf-core dir when copying. Chown conda folder only when using conda
JulianFlesch May 27, 2025
7e1aba2
Remove unneeded dependencies and those already in base image
JulianFlesch May 27, 2025
14a3e95
Fix command end
JulianFlesch May 27, 2025
6d284fb
WIP: Comment out section adding lots of size to the image
JulianFlesch May 27, 2025
5d8503b
Use vscode user everywhere
JulianFlesch May 27, 2025
08d29fc
Re-introduce nextflow update, nf-core dev, and commit hooks install
JulianFlesch May 27, 2025
c5dd2d2
Use nextflow/training base image to share nextflow, conda installation
JulianFlesch May 27, 2025
0fa9993
Add setup.sh to fix run issues with nf/training img. Move latest tool…
JulianFlesch May 28, 2025
2eceaf7
change ownership of nextflow installation location
JulianFlesch May 28, 2025
4b825df
Update comment. Change layer order
JulianFlesch May 28, 2025
d7854ff
Update template devcontainer
JulianFlesch May 28, 2025
3dff96d
Remove testing Dockerfiles
JulianFlesch May 28, 2025
4e9d298
Merge branch 'dev' into issues/3466-gitpod
JulianFlesch Jun 17, 2025
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: 7 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"postCreateCommand": "python -m pip install --upgrade -r ../requirements-dev.txt -e ../ && pre-commit install --install-hooks",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],
"image": "nfcore/devcontainer:latest",

"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},

"remoteUser": "vscode",

// Configure tool-specific properties.
"customizations": {
Expand Down
14 changes: 14 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash

# Customise the terminal command prompt
printf "export PS1='\\[\\e[3;36m\\]\${PWD#/workspaces/} ->\\[\\e[0m\\] '\n" >> $HOME/.bashrc
export PS1='\[\e[3;36m\]${PWD#/workspaces/} ->\[\e[0m\] '

# Update Nextflow
nextflow self-update

# Install nf-core tools in editable mode
python -m pip install -r requirements-dev.txt -e . --no-cache-dir

# Install pre-commit hooks
pre-commit install --install-hooks
6 changes: 3 additions & 3 deletions .github/workflows/push_dockerhub_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
- name: Build nfcore/tools:dev docker image
run: docker build --no-cache . -t nfcore/tools:dev

- name: Build nfcore/gitpod:dev docker image
run: docker build --no-cache . --file nf_core/gitpod/gitpod.Dockerfile -t nfcore/gitpod:dev
- name: Build nfcore/devcontainer:dev docker image
run: docker build --no-cache . --file nf_core/devcontainer/devcontainer.Dockerfile -t nfcore/devcontainer:dev

- name: Push Docker images to DockerHub (dev)
run: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push nfcore/tools:dev
docker push nfcore/gitpod:dev
docker push nfcore/devcontainer:dev
10 changes: 5 additions & 5 deletions .github/workflows/push_dockerhub_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
- name: Build nfcore/tools:latest docker image
run: docker build --no-cache . -t nfcore/tools:latest

- name: Build nfcore/gitpod:latest docker image
run: docker build --no-cache . --file nf_core/gitpod/gitpod.Dockerfile -t nfcore/gitpod:latest
- name: Build nfcore/devcontainer:latest docker image
run: docker build --no-cache . --file nf_core/devcontainer/devcontainer.Dockerfile -t nfcore/devcontainer:latest

- name: Push Docker images to DockerHub (release)
run: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push nfcore/tools:latest
docker tag nfcore/tools:latest nfcore/tools:${{ github.event.release.tag_name }}
docker push nfcore/tools:${{ github.event.release.tag_name }}
docker push nfcore/gitpod:latest
docker tag nfcore/gitpod:latest nfcore/gitpod:${{ github.event.release.tag_name }}
docker push nfcore/gitpod:${{ github.event.release.tag_name }}
docker push nfcore/devcontainer:latest
docker tag nfcore/devcontainer:latest nfcore/devcontainer:${{ github.event.release.tag_name }}
docker push nfcore/devcontainer:${{ github.event.release.tag_name }}
12 changes: 0 additions & 12 deletions .gitpod.yml

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

- Add conda cache dir ([#3610](https://github.com/nf-core/tools/pull/3610))
- Fixes a bug with the test-datasets subcommand [#3617](https://github.com/nf-core/tools/issues/3617)
- Stop using Gitpod in favor of devcontainer for codespaces ([#3569](https://github.com/nf-core/tools/pull/3569))

## [v3.3.1 - Tungsten Tamarin Patch](https://github.com/nf-core/tools/releases/tag/3.3.1) - [2025-06-02]

Expand Down
21 changes: 21 additions & 0 deletions nf_core/devcontainer/devcontainer.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Test build locally before making a PR (from project root directory)
# docker build . -t devcontainer:local -f nf_core/devcontainer/devcontainer.Dockerfile

# Uses mcr.microsoft.com/devcontainers/base:ubuntu
FROM ghcr.io/nextflow-io/training:latest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pin the version!


# Change user to vscode
USER vscode

# Add the nf-core source files to the image
COPY --chown=vscode:vscode . /usr/src/nf_core
WORKDIR /usr/src/nf_core

# Change ownership of conda and nextflow bin
RUN sudo chown -R vscode:vscode /usr/local/bin/ && \
sudo chown -R vscode:vscode /opt/conda

# Install apptainer via conda
RUN conda install --quiet --yes --update-all --name base \
conda-forge::apptainer>=1.4.1 && \
conda clean --all --force-pkgs-dirs --yes
66 changes: 0 additions & 66 deletions nf_core/gitpod/gitpod.Dockerfile

This file was deleted.

9 changes: 6 additions & 3 deletions nf_core/pipeline-template/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],
"image": "nfcore/devcontainer:latest",
"remoteUser": "vscode",

"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},

// Configure tool-specific properties.
"customizations": {
Expand Down
8 changes: 8 additions & 0 deletions nf_core/pipeline-template/.devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

# Customise the terminal command prompt
printf "export PS1='\\[\\e[3;36m\\]\${PWD#/workspaces/} ->\\[\\e[0m\\] '\n" >> $HOME/.bashrc
export PS1='\[\e[3;36m\]${PWD#/workspaces/} ->\[\e[0m\] '

# Update Nextflow
nextflow self-update
10 changes: 0 additions & 10 deletions nf_core/pipeline-template/.gitpod.yml

This file was deleted.

Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载