diff --git a/Docker/REAMDE.md b/Docker/REAMDE.md new file mode 100644 index 0000000..bab10d1 --- /dev/null +++ b/Docker/REAMDE.md @@ -0,0 +1,31 @@ +# Build images for nextflow + +In order to update the nf-core module of vuegen +([modules/nf-core/vuegen](https://github.com/nf-core/modules/tree/master/modules/nf-core/vuegen)) to a new version, the corresponding docker image needs to be build and pushed to quay.io and then a PR with the updates needs to be submitted to nf-core/modules. + + +## Upload to Quay.io + +Update the container: + - This can be done using the [`build-push.sh`](build-push.sh) script + (after [login to quay.io](https://docs.quay.io/guides/login.html) using `docker login quay.io` + and activating multiplatform builds for your docker driver, e.g. + [docker desktop](https://docs.docker.com/desktop/features/containerd/#enable-the-containerd-image-store).) + - by uploading `nextflow.Dockerfile` (start new build) and specifying a new tag on quay.io itself (being logged-in): + [https://quay.io/repository/dtu_biosustain_dsp/vuegen?tab=builds](quay.io/repository/dtu_biosustain_dsp/vuegen?tab=builds) and + [https://quay.io/repository/dtu_biosustain_dsp/vuegen?tab=tags](quay.io/repository/dtu_biosustain_dsp/vuegen?tab=tags) + +General docs: [https://docs.quay.io/guides/building.html](docs.quay.io/guides/building.html) + + +## Update nf-core module + +Follow the instructions as if you would create a new module: +[https://nf-co.re/docs/tutorials/nf-core_components/components](nf-co.re/docs/tutorials/nf-core_components/components) + +- update `environment.yml` to specify the new version of vuegen on bioconda (this is an automated update) +- update `main.nf` to specify the new version of the container on quay.io (this is a manual update described in the step above) + +Then submit a PR to nf-core/modules, e.g. + +- [https://github.com/nf-core/modules/pull/9201](nf-core/modules/pull/9201) diff --git a/Docker/build-push.sh b/Docker/build-push.sh index 0b2c043..e63fc91 100644 --- a/Docker/build-push.sh +++ b/Docker/build-push.sh @@ -2,7 +2,7 @@ set -euo pipefail ORG="quay.io/dtu_biosustain_dsp" -VERSION="v0.5.0" +VERSION="v0.5.1" # 1. Build & push the base image (nextflow version) docker buildx build \ @@ -17,4 +17,4 @@ docker buildx build \ --build-arg BASE_VERSION=${VERSION}-nextflow \ --push \ -t ${ORG}/vuegen:${VERSION}-docker \ - -f docker.Dockerfile . \ No newline at end of file + -f docker.Dockerfile . diff --git a/Docker/nextflow.Dockerfile b/Docker/nextflow.Dockerfile index d7cac77..bc83a20 100644 --- a/Docker/nextflow.Dockerfile +++ b/Docker/nextflow.Dockerfile @@ -17,7 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Install vuegen Python packag +# Install vuegen Python package RUN pip install --no-cache-dir -U vuegen # Create and switch to non-root user for security reasons @@ -42,4 +42,4 @@ ENV XDG_RUNTIME_DIR=/tmp \ XDG_CACHE_HOME=/tmp/quarto_cache_home \ XDG_DATA_HOME=/tmp/quarto_data_home \ PATH="${PATH}:/home/appuser/bin" \ - PYTHONFAULTHANDLER=1 \ No newline at end of file + PYTHONFAULTHANDLER=1 diff --git a/modules/VUEGEN.nf b/modules/VUEGEN.nf index 2cdb0ad..3c2bf03 100644 --- a/modules/VUEGEN.nf +++ b/modules/VUEGEN.nf @@ -45,7 +45,7 @@ process VUEGEN { cat <<-END_VERSIONS > versions.yml "${task.process}": - vuegen: \$( vuegen --version | sed -e "s/vuegen //g" ) + vuegen: \$( python -c "import vuegen; print(vuegen.__version__)" ) END_VERSIONS """ @@ -57,7 +57,7 @@ process VUEGEN { cat <<-END_VERSIONS > versions.yml "${task.process}": - vuegen: \$( vuegen --version | sed -e "s/vuegen //g" ) + vuegen: \$( python -c "import vuegen; print(vuegen.__version__)" ) END_VERSIONS """ } diff --git a/modules/environment.yml b/modules/environment.yml index 5440d23..bfd765f 100644 --- a/modules/environment.yml +++ b/modules/environment.yml @@ -4,4 +4,5 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::vuegen=0.3.2 + - bioconda::vuegen=0.5.1 + - conda-forge::python=3.12