Fetch upstream

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: github branch
         run: |
           if [ "${{ github.event.release.target_commitish }}" != "" ]; then
@@ -46,9 +46,10 @@ jobs:
           else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8
       - name: Cache SBT ivy cache
         uses: actions/cache@v1
         with:
@@ -84,7 +85,7 @@ jobs:
         ports:
           - 27017:27017
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: github branch
         run: |
           if [ "${{ github.event.release.target_commitish }}" != "" ]; then
@@ -100,16 +101,17 @@ jobs:
           else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8
       - name: Cache SBT ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('project/Build.scala') }}
       - name: Cache SBT
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('project/Build.scala') }}
@@ -128,7 +130,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: github branch
         run: |
           if [ "${{ github.event.release.target_commitish }}" != "" ]; then
@@ -144,16 +146,17 @@ jobs:
           else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8
       - name: Cache SBT ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('project/Build.scala') }}
       - name: Cache SBT
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('project/Build.scala') }}
@@ -204,7 +207,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: github branch
         run: |
           if [ "${{ github.event.release.target_commitish }}" != "" ]; then
@@ -220,16 +223,17 @@ jobs:
           else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8
       - name: Cache SBT ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('project/Build.scala') }}
       - name: Cache SBT
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('project/Build.scala') }}

.github/workflows/docker.yml

@@ -29,8 +29,12 @@ env:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    env:
+      dockerhub: ${{ secrets.DOCKERHUB_USERNAME }}
+    permissions:
+      packages: write
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         name:
           - clowder
@@ -42,126 +46,162 @@ jobs:
             FOLDER: "."
             IMAGE: clowder
             README: README.md
+            PLATFORM: "linux/amd64,linux/arm64"
           - name: mongo-init
             FOLDER: scripts/mongo-init
             IMAGE: mongo-init
             README: ""
+            PLATFORM: "linux/amd64"
           - name: monitor
             FOLDER: scripts/monitor
             IMAGE: monitor
             README: ""
+            PLATFORM: "linux/amd64,linux/arm64"
           - name: elasticsearch
             FOLDER: scripts/elasticsearch
             IMAGE: elasticsearch
             README: ""
+            PLATFORM: "linux/amd64"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # calculate some variables that are used later
-      - name: github branch
+      - name: variable setup
         run: |
           if [ "${{ github.event.release.target_commitish }}" != "" ]; then
             BRANCH="${{ github.event.release.target_commitish }}"
+          elif [[ $GITHUB_REF =~ pull ]]; then
+            BRANCH="$(echo $GITHUB_REF | sed 's#refs/pull/\([0-9]*\)/merge#PR-\1#')"
           else
             BRANCH=${GITHUB_REF##*/}
           fi
-          echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
+
           if [ "$BRANCH" == "master" ]; then
             version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
             tags="latest"
             oldversion=""
             while [ "${oldversion}" != "${version}" ]; do
               oldversion="${version}"
-              tags="${tags},${version}"
+              tags="${tags} ${version}"
               version=${version%.*}
             done
-            echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
-            echo "CLOWDER_TAGS=${tags}" >> $GITHUB_ENV
+            version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
           elif [ "$BRANCH" == "develop" ]; then
-            echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
-            echo "CLOWDER_TAGS=develop" >> $GITHUB_ENV
+            version="develop"
+            tags="develop"
           else
-            echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
-            echo "CLOWDER_TAGS=" >> $GITHUB_ENV
+            version="test"
+            tags="${BRANCH}"
           fi
 
-      # build the docker image, this will always run to make sure
-      # the Dockerfile still works.
-      - name: Build image
-        uses: elgohr/[email protected]
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.CLOWDER_VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
+          push_tags=""
+          for tag in ${tags}; do
+            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%,*}"
+
+          echo "BRANCH=${BRANCH}"
+          echo "VERSION=${version}"
+          echo "TAGS=${tags}"
+          echo "PUSH_TAGS=${push_tags}"
+
+          echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
+          echo "VERSION=${version}" >> $GITHUB_ENV
+          echo "TAGS=${push_tags}" >> $GITHUB_ENV
+
+      # setup docker build
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Inspect Builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+
+      # login to registries
+      - name: Login to DockerHub
+        if: env.dockerhub != ''
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
         with:
-          registry: docker.pkg.github.com
-          name: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ matrix.IMAGE }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
+      # build the clowder docker images
+      - name: Build and push ${{ matrix.IMAGE }}-build
+        if: matrix.IMAGE == 'clowder'
+        uses: docker/build-push-action@v2
+        with:
+          push: true
           context: ${{ matrix.FOLDER }}
-          tags: "${{ env.TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
-          no_push: true
-
-      # this will publish to github container registry
-      - name: Publish to GitHub
-        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
-        uses: elgohr/[email protected]
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.CLOWDER_VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
+          platforms: ${{ matrix.PLATFORM }}
+          target: ${{ matrix.IMAGE }}-build
+          cache-from: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-build-cache:${{ env.BRANCH }}
+          cache-to: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-build-cache:${{ env.BRANCH }},mode=max
+          tags: ${{ env.TAGS }}
+          build-args: |
+            BRANCH=${{ env.BRANCH }}
+            VERSION=${{ env.VERSION }}
+            BUILDNUMBER=${{ github.run_number }}
+            GITSHA1=${{ github.sha  }}
+
+      - name: Build and push ${{ matrix.IMAGE }}-runtime
+        if: matrix.IMAGE == 'clowder'
+        uses: docker/build-push-action@v2
         with:
-          registry: ghcr.io
-          name: ${{ github.repository_owner }}/${{ matrix.IMAGE }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_PASSWORD }}
+          push: true
           context: ${{ matrix.FOLDER }}
-          tags: "${{ env.CLOWDER_TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+          platforms: ${{ matrix.PLATFORM }}
+          target: ${{ matrix.IMAGE }}-runtime
+          cache-from: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-runtime-cache:${{ env.BRANCH }}
+          cache-to: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-runtime-cache:${{ env.BRANCH }}
+          tags: ${{ env.TAGS }}
+          build-args: |
+            BRANCH=${{ env.BRANCH }}
+            VERSION=${{ env.VERSION }}
+            BUILDNUMBER=${{ github.run_number }}
+            GITSHA1=${{ github.sha  }}
 
-      # this will publish to the clowder dockerhub repo
-      - name: Publish to Docker Hub
-        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
-        uses: elgohr/[email protected]
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.CLOWDER_VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
+      # build the other docker images
+      - name: Build and push ${{ matrix.IMAGE }}
+        if: matrix.IMAGE != 'clowder'
+        uses: docker/build-push-action@v2
         with:
-          name: ${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          push: true
           context: ${{ matrix.FOLDER }}
-          tags: "${{ env.CLOWDER_TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+          platforms: ${{ matrix.PLATFORM }}
+          cache-from: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-cache:${{ env.BRANCH }}
+          cache-to: type=registry,ref=${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}-cache:${{ env.BRANCH }},mode=max
+          tags: ${{ env.TAGS }}
+          build-args: |
+            BRANCH=${{ env.BRANCH }}
+            VERSION=${{ env.VERSION }}
+            BUILDNUMBER=${{ github.run_number }}
+            GITSHA1=${{ github.sha  }}
 
-      # this will update the README of the dockerhub repo
-      - name: check file
-        id: filecheck
-        run: |
-          if [ "${{ matrix.README }}" != "" ]; then
-            if [ -e "${{ matrix.README }}" ]; then
-              echo "##[set-output name=readme;]${{ matrix.README }}"
-            else
-              echo "##[set-output name=readme;]"
-            fi
-          else
-            if [ -e "${{ matrix.FOLDER }}/README.md" ]; then
-              echo "##[set-output name=readme;]${{ matrix.FOLDER }}/README.md"
-            else
-              echo "##[set-output name=readme;]"
-            fi
-          fi
+      # update README at DockerHub
       - name: Docker Hub Description
-        if: github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master' && steps.filecheck.outputs.readme != ''
+        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 }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
           DOCKERHUB_REPOSITORY: ${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}
-          README_FILEPATH: ${{ steps.filecheck.outputs.readme }}
+          README_FILEPATH: ${{ matrix.README }}

.github/workflows/swagger.yml

@@ -20,9 +20,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: openapi-lint 
-        uses: mhiew/redoc-lint-github-action@v2
+        uses: mbowman100/swagger-validator-action@master
         with:
-          args: 'public/swagger.yml --skip-rule operation-operationId'
+          files: public/swagger.yml

.gitignore

@@ -30,3 +30,4 @@ doc/src/sphinx/_build
 .DS_Store
 /doc/src/sphinx/_build
 **/.c9/*
+*~