Merge pull request #288 from nf-core/dev

Release PR for 1.1.2

CHANGELOG.md

@@ -3,6 +3,18 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.1.2 - [2023-06-30]
+
+### `Added`
+
+### `Fixed`
+
+- [#279](https://github.com/nf-core/funcscan/pull/279) Fix docker/podman registry definition for tower compatibility. (♥️ to sunitj for reporting, fix by @adamrtalbot)
+
+### `Dependencies`
+
+### `Deprecated`
+
 ## v1.1.1 - [2023-05-24]
 
 ### `Added`

conf/base.config

@@ -115,6 +115,7 @@ process {
     withName: DEEPARG_DOWNLOADDATA {
         memory = { check_max( 2.GB * task.attempt, 'memory'  ) }
         cpus   = 1
+        time   = { check_max( 2.h  * task.attempt, 'time'     ) }
     }
 
     withName: DEEPARG_PREDICT {

nextflow.config

@@ -259,7 +259,6 @@ profiles {
     docker {
         conda.enabled          = false
         docker.enabled         = true
-        docker.registry        = 'quay.io'
         docker.userEmulation   = true
         conda.enabled          = false
         singularity.enabled    = false
@@ -283,7 +282,6 @@ profiles {
     }
     podman {
         podman.enabled         = true
-        podman.registry        = 'quay.io'
         conda.enabled          = false
         docker.enabled         = false
         singularity.enabled    = false
@@ -350,6 +348,12 @@ env {
 // Capture exit codes from upstream processes when piping
 process.shell = ['/bin/bash', '-euo', 'pipefail']
 
+// Set default registry for Docker and Podman independent of -profile
+// Will not be used unless Docker / Podman are enabled
+// Set to your registry if you have a mirror of containers
+docker.registry = 'quay.io'
+podman.registry = 'quay.io'
+
 def trace_timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss')
 timeline {
     enabled = true
@@ -375,7 +379,7 @@ manifest {
     description     = """Pipeline for screening for functional components of assembled contigs"""
     mainScript      = 'main.nf'
     nextflowVersion = '!>=22.10.1'
-    version         = '1.1.1'
+    version         = '1.1.2'
     doi             = '10.5281/zenodo.7643099'
 }