Merge branch 'release/1.21.0' into misc-fixes

Author: robkooper

.github/workflows/docker.yml

@@ -29,6 +29,8 @@ env:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    env:
+      dockerhub: ${{ secrets.DOCKERHUB_USERNAME }}
     permissions:
       packages: write
     strategy:
@@ -95,7 +97,9 @@ jobs:
 
           push_tags=""
           for tag in ${tags}; do
-            push_tags="${push_tags}${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}:${tag},"
+            if [ "${{ secrets.DOCKERHUB_USERNAME }}" == "" ]; then
+              push_tags="${push_tags}${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}:${tag},"
+            fi
             push_tags="${push_tags}ghcr.io/${{ github.repository_owner }}/${{ matrix.IMAGE }}:${tag},"
           done
           push_tags="${push_tags%,*}"
@@ -127,6 +131,7 @@ jobs:
 
       # login to registries
       - name: Login to DockerHub
+        if: env.dockerhub != ''
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -193,7 +198,7 @@ jobs:
 
       # update README at DockerHub
       - name: Docker Hub Description
-        if: matrix.README != '' && github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master'
+        if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master'
         uses: peter-evans/dockerhub-description@v2
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

CHANGELOG.md

@@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## Unreleased
+## 1.21.0 - 2022-08-23
+
+### Fixed
+- Fix to remove dataset from a space [#349](https://github.com/clowder-framework/clowder/issues/349)
+  (The count might be off to existing spaces, please run fixCounts script)
 
 **_Important:_** This update requires a MongoDB update schema due to a bug in the original migration  of showing summary statistics at the
 space level. Make sure to start the application with -DMONGOUPDATE=1. You can also run the [fixCounts.js](https://github.com/clowder-framework/clowder/blob/develop/scripts/updates/fix-counts.js)
@@ -23,6 +27,7 @@ script prior to upgrading to minimize the downtime.
 - Send email to all admins in a single email when a user submits 'Request access' for a space
 - Send email to all admins and request user in a single email when any admin accepts/rejects 'Request access' for a space [#330](https://github.com/clowder-framework/clowder/issues/330)
 - script/code to count space in files was not correct [#366](https://github.com/clowder-framework/clowder/issues/336)
+- github actions would fail for docker builds due to secrets not existing
 
 ## 1.20.3 - 2022-06-10
 

app/services/mongodb/MongoDBSpaceService.scala

@@ -429,7 +429,6 @@ class MongoDBSpaceService @Inject() (
     datasets.get(dataset) match {
       case Some(x) => {
         val datasetBytes = datasets.getBytesForDataset(dataset)
-        datasets.addToSpace(dataset, space)
         ProjectSpaceDAO.update(MongoDBObject("_id" -> new ObjectId(space.stringify)), $inc("spaceBytes" -> -1 * datasetBytes), upsert=false, multi=false, WriteConcern.Safe)
         ProjectSpaceDAO.update(MongoDBObject("_id" -> new ObjectId(space.stringify)), $inc("fileCount" -> -1 * x.files.length), upsert=false, multi=false, WriteConcern.Safe)
         ProjectSpaceDAO.update(MongoDBObject("_id" -> new ObjectId(space.stringify)), $inc("datasetCount" -> -1), upsert=false, multi=false, WriteConcern.Safe)

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.20.3'
+release = '1.21.0'
 
 
 # -- General configuration ---------------------------------------------------

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.20.3"
+  val version = "1.21.0"
   val jvm = "1.7"
 
   def appVersion: String = {

public/swagger.yml

@@ -9,7 +9,7 @@ info:
     Clowder is a customizable and scalable data management system to support any
     data format and multiple research domains. It is under active development
     and deployed for a variety of research projects.
-  version: 1.20.3
+  version: 1.21.0
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder