Merge branch 'development'

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    pull-request-branch-name:
+      separator: "-" # Use "-" instead of "/" in branch names to avoid issues with docker registries
+    target-branch: "development" # raise PRs for version updates to GHA against the `development` branch

.github/pull_request_template.md

@@ -22,6 +22,6 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
 Select: **Reviewer(s)**
 Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
 Select: **Milestone** as the version that will include these changes
-- [ ] After submitting the PR, select **Development** issue with the original issue number.
+- [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
 - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
 - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.

.github/workflows/build.yml

@@ -42,9 +42,9 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 120
     strategy:
-      fail-fast: true
+      # fail-fast: true  # FIXME: Reactivate fail-fast once our image size is under control
       matrix:
         app: 
           - met-airquality
@@ -105,19 +105,19 @@ jobs:
             --build-arg COMMITSHA=${{ github.sha }} \
             -t ${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }} \
             .
+      # FIXME: Reactivate image scanning once we've determined why the image size has blown up
+      # - name: Scan image with Trivy
+      #   uses: aquasecurity/trivy-action@master
+      #   with:
+      #     image-ref: '${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }}'
+      #     format: 'sarif'
+      #     output: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
+      #     ignore-unfixed: true
 
-      - name: Scan image with Trivy
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: '${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }}'
-          format: 'sarif'
-          output: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
-          ignore-unfixed: true
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
+      # - name: Upload Trivy scan results to GitHub Security tab
+      #   uses: github/codeql-action/upload-sarif@v2
+      #   with:
+      #     sarif_file: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1

.github/workflows/trivy-repo-analysis.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read

Dockerfile

@@ -1,5 +1,5 @@
 # This tag here should match the app's Meteor version, per .meteor/release
-FROM geoffreybooth/meteor-base:2.11.0 AS meteor-builder
+FROM geoffreybooth/meteor-base:2.12 AS meteor-builder
 
 ARG APPNAME
 
@@ -19,56 +19,30 @@ COPY MATScommon /MATScommon
 RUN bash ${SCRIPTS_FOLDER}/build-meteor-bundle.sh
 
 
-# Install OS build dependencies
-FROM node:14-alpine AS native-builder
-
-ENV APP_FOLDER=/usr/app
-ENV APP_BUNDLE_FOLDER=${APP_FOLDER}/bundle
-ENV SCRIPTS_FOLDER /docker
-
-# Install OS build dependencies, which stay with this intermediate image but don’t become part of the final published image
-RUN apk --no-cache add \
-    bash \
-    g++ \
-    make \
-    python3
-
-# Copy in build scripts & entrypoint
-COPY --from=meteor-builder $SCRIPTS_FOLDER $SCRIPTS_FOLDER/
-
-# Copy in app bundle
-COPY --from=meteor-builder /opt/bundle $APP_BUNDLE_FOLDER/
-
-# Build the native dependencies
-# NOTE - the randyp_mats-common atmosphere package pulls in a native npm couchbase dependency
-# so we need to force an npm rebuild in the node_modules directory there as well
-RUN bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh
-
-
 # Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html
-FROM node:14-alpine AS production
+FROM node:14-bullseye-slim AS production
 
 # Set Build ARGS
 ARG APPNAME
 ARG BUILDVER=dev
 ARG COMMITBRANCH=development
 ARG COMMITSHA
-ARG METCALCPYVER=develop
+
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install runtime dependencies
-RUN apk --no-cache add \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     bash \
-    git \
     ca-certificates \
-    mariadb \
     python3 \
-    py3-numpy \
-    py3-scipy \
-    py3-pandas \
-    py3-pip \
-    && pip3 --no-cache-dir install \
-        pymysql \
-        metcalcpy@git+https://github.com/dtcenter/METcalcpy.git@${METCALCPYVER}
+    python3-pip \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && python3 -m pip install --no-cache-dir \
+        metcalcpy \
+        numpy \
+        scipy \
+        pandas \
+        pymysql
 
 # Set Environment
 ENV APP_FOLDER=/usr/app
@@ -83,11 +57,11 @@ ENV VERSION=${BUILDVER}
 ENV BRANCH=${COMMITBRANCH}
 ENV COMMIT=${COMMITSHA}
 
-# Copy in helper scripts with the built and installed dependencies from the previous image
-COPY --from=native-builder ${SCRIPTS_FOLDER} ${SCRIPTS_FOLDER}/
+# Copy in helper scripts from the previous image
+COPY --from=meteor-builder ${SCRIPTS_FOLDER} ${SCRIPTS_FOLDER}/
 
-# Copy in app bundle with the built and installed dependencies from the previous image
-COPY --from=native-builder ${APP_BUNDLE_FOLDER} ${APP_BUNDLE_FOLDER}/
+# Copy in app bundle from the previous image
+COPY --from=meteor-builder /opt/bundle ${APP_BUNDLE_FOLDER}/
 
 # We want to use our own launcher script
 COPY container-scripts/run_app.sh ${APP_FOLDER}/
@@ -100,6 +74,15 @@ RUN mkdir -p ${SETTINGS_DIR} \
     && chown node:node ${APP_BUNDLE_FOLDER}/bundle/programs/server/fileCache \
     && chmod 644 ${APP_BUNDLE_FOLDER}/bundle/programs/server/fileCache
 
+# Install the Meteor app's NPM dependencies
+# g++ & build-essential would be needed for ARM/Apple Silicon builds in order to recompile fibers
+RUN bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh
+
+# Update the OS packages in the container
+RUN apt-get update \
+    && apt-get -y upgrade \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 EXPOSE ${PORT}
 USER node
 
@@ -115,7 +98,7 @@ LABEL version=${BUILDVER} code.branch=${COMMITBRANCH} code.commit=${COMMITSHA}
 
 
 # Create a stage with the root user for debugging
-# Note - you'll need to override the entrypoint if you want a shell (docker run --entrypoint /bin/bash ...)
+# Note - you'll need to override the entrypoint if you want a shell (docker run -it --entrypoint /bin/bash ...)
 FROM production AS debug
 USER root
 

README.md

@@ -4,7 +4,9 @@
 
 A METexpress app is a [Meteor](https://www.meteor.com/) app that is based on NOAA Global Systems Lab's "[MATS](https://www.github.com/NOAA-GSL/MATS)" Model Analysis Tool Suite application framework. The METexpress apps are specifically designed to be used to visualize [MET](https://dtcenter.org/community-code/model-evaluation-tools-met) data that has been loaded into a [METdatadb](https://dtcenter.org/metplus-practical-session-guide-feb-2019/session-5-trkintfeature-relative/metviewer) database.
 
-The official NWS METexpress instance can be found at [metexpress.nws.noaa.gov](https://metexpress.nws.noaa.gov/)
+The official NWS METexpress instance can be found at [metexpress.nws.noaa.gov](https://metexpress.nws.noaa.gov/).
+
+For information about the support provided for releases, see our [Release Support Policy](https://metplus.readthedocs.io/en/develop/Release_Guide/index.html#release-support-policy).
 
 ## Installing & Running METexpress
 

apps/met-airquality/.meteor/packages

@@ -6,26 +6,26 @@
 
 [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
-[email protected].5                   # The database Meteor supports right now
+[email protected].6                   # The database Meteor supports right now
 blaze-html-templates    # Compile .html files into Meteor Blaze views
 [email protected]            # Reactive variable for tracker
 [email protected]                  # Helpful client-side library
-[email protected].1                 # Meteor's client-side reactive programming library
+[email protected].2                 # Meteor's client-side reactive programming library
 [email protected]    # JS minifier run for production mode
 [email protected]                # ECMAScript 5 compatibility for older browsers.
-[email protected].6              # Enable ECMAScript2015+ syntax in app code
+[email protected].7              # Enable ECMAScript2015+ syntax in app code
 [email protected]            # Server-side component of the `meteor shell` command
 pcel:mysql
 seba:minifiers-autoprefixer
 [email protected]
 momentjs:moment
-randyp:[email protected].0
+randyp:[email protected].1
 [email protected]
-[email protected].7
+[email protected].8
 [email protected]
 [email protected]
-[email protected].2
-[email protected].12
+[email protected].3
+[email protected].13
 kadira:blaze-layout
 ostrio:flow-router-extra
 meteorhacks:picker

apps/met-airquality/.meteor/release

@@ -1 +1 @@
-METEOR@2.11.0
+METEOR@2.12

apps/met-airquality/.meteor/versions

@@ -1,37 +1,37 @@
-[email protected].7
+[email protected].8
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
-blaze@2.6.1
+blaze@2.7.1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-ddp-rate-limiter@1.1.1
-[email protected].0
+ddp-rate-limiter@1.2.0
+[email protected].1
 [email protected]
 differential:[email protected]
-[email protected].2
-[email protected].6
-[email protected].0
+[email protected].3
+[email protected].7
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
-[email protected].4
+[email protected].5
 [email protected]
 [email protected]
 [email protected]
@@ -49,37 +49,37 @@ [email protected]
 [email protected]
 [email protected]
 mdg:[email protected]
-[email protected].1
+[email protected].2
 [email protected]
 meteorhacks:[email protected]
 meteortoys:[email protected]
-[email protected].2
+[email protected].4
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 momentjs:[email protected]
-[email protected].5
+[email protected].6
 [email protected]
 [email protected]
 [email protected]
 msavin:[email protected]
 natestrauser:[email protected]
-npm-mongo@4.14.0
+npm-mongo@4.16.0
 [email protected]
 [email protected]
-[email protected].20
+[email protected].21
 [email protected]
 ostrio:[email protected]
 pcel:[email protected]
 [email protected]
 [email protected]
-randyp:[email protected].0
-rate-limit@1.0.9
-[email protected].6
+randyp:[email protected].1
+rate-limit@1.1.1
+[email protected].7
 [email protected]
 [email protected]
 [email protected]
@@ -91,19 +91,19 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
-spacebars@1.3.0
+[email protected].1
+spacebars@1.4.1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].3
 [email protected]
-[email protected].1
+[email protected].2
 twbs:[email protected]
-[email protected].12
+[email protected].13
 [email protected]
-[email protected].4
+[email protected].5
 [email protected]
 yasinuslu:[email protected]
 zodern:[email protected]