Merge pull request #1268 from opendatacube/develop

Merge release 1.8.7 into stable branch

.dockerignore

@@ -2,6 +2,81 @@
 .circleci
 .github
 .travis
-contrib
-examples
 integration_tests
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis
+.pytest_cache
+.mypy_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+.idea/
+
+# iPython Notebook
+.ipynb_checkpoints
+
+# Mac OS X
+.DS_Store
+docs/html/
+
+# Generated Documentation
+generate/
+docs/notebooks/
+
+#Local Visual Studio Code configurations
+.vscode/
+.env

.github/ISSUE_TEMPLATE.md

@@ -14,3 +14,9 @@
 
 * Which ``datacube --version`` are you using?
 * What datacube deployment/enviornment are you running against?
+
+
+> **Note:** Stale issues will be automatically closed after a period of six months with no activity. 
+> To ensure critical issues are not closed, tag them with the Github `pinned` tag.
+> If you are a community member and not a maintainer please escalate this issue to maintainers via
+> [GIS StackExchange](https://gis.stackexchange.com/questions/tagged/open-data-cube) or [Slack](http://slack.opendatacube.org).

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 120
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 60
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/build-docs.yml

@@ -1,6 +1,7 @@
 name: build-docs
 
 on:
+  pull_request:
   push:
     branches:
       - develop
@@ -25,7 +26,7 @@ jobs:
     - name: Build Docs
       run: |
         cat <<EOF | docker run --rm -i  \
-                  -v $(pwd):/src/datacube-core \
+                  -v $(pwd):/code \
                   -e SKIP_DB=yes \
                   ${DKR} bash -
         sudo apt-get update && sudo apt-get install -y plantuml make

.github/workflows/docker-test-runner.yml

@@ -20,7 +20,6 @@ on:
 env:
   ORG: opendatacube
   IMAGE: datacube-tests
-  BUILDER_TAG: _build_cache
   DOCKER_USER: gadockersvc
 
 
@@ -33,59 +32,61 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.6'
-
-    # This is just to get dependencies right, we do not keep datacube in the final image
-    - name: Install packaging dependencies
-      run: |
-        # needed for version getting
-        git fetch --prune --unshallow 2> /dev/null || true
-
-        python -m pip install -U --force \
-          "setuptools>=42" \
-          "setuptools_scm[toml]>=3.4" \
-          wheel \
-          twine
-
-    # This is just to get dependencies right, we do not keep datacube in the final image
-    - name: Build datacube wheel
+    - name: Config
+      id: cfg
       run: |
-        mkdir -p ./docker/dist/
-        find ./docker/dist/ -type f -delete
+        echo ::set-output name=docker_image::${ORG}/${IMAGE}:latest
 
-        python setup.py bdist_wheel --dist-dir ./docker/dist/
-        ls -lh ./docker/dist/
-        twine check ./docker/dist/*
+    # This is the a separate action that sets up buildx runner
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
 
-    - name: Pull docker cache
-      run: |
-        docker pull ${ORG}/${IMAGE}:latest         || true
-        docker pull ${ORG}/${IMAGE}:${BUILDER_TAG} || true
+    - name: Cache Docker layers
+      uses: pat-s/always-upload-cache@v2.1.5
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
 
-    - name: Build Test Runner Docker
+    - name: Build Docker
+      uses: docker/build-push-action@v2
+      with:
+        file: docker/Dockerfile
+        context: .
+        tags: ${{ steps.cfg.outputs.docker_image }}
+        outputs: type=docker
+        build-args: |
+          V_BASE=3.3.0
+          V_PG=12
+        cache-from: |
+          type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+    # This ugly bit is necessary if you don't want your cache to grow forever
+    # till it hits GitHub's limit of 5GB.
+    # Temp fix
+    # https://github.com/docker/build-push-action/issues/252
+    # https://github.com/moby/buildkit/issues/1896
+    - name: Move cache
       run: |
-        # build and cache first stage (env_builder)
-        docker build \
-          --target env_builder \
-          --cache-from ${ORG}/${IMAGE}:${BUILDER_TAG} \
-          --tag        ${ORG}/${IMAGE}:${BUILDER_TAG} \
-          ./docker/
-
-        # now build second stage making sure first stage is from cache
-        docker build \
-          --cache-from ${ORG}/${IMAGE}:${BUILDER_TAG} \
-          --cache-from ${ORG}/${IMAGE}:latest \
-          --tag        ${ORG}/${IMAGE}:latest \
-          ./docker/
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
     - name: Verify Docker Image
       run: |
+        # Make sure we test docker image we built
+        if [[ "${{ steps.cfg.outputs.docker_image }}" != "opendatacube/datacube-tests:latest" ]]; then
+            docker tag "${{ steps.cfg.outputs.docker_image }}" opendatacube/datacube-tests:latest
+        fi
+
         ./check-code.sh --with-docker integration_tests
 
-    - name: DockerHub Push
+        echo "Verify that twine is installed"
+        docker run --rm opendatacube/datacube-tests:latest twine --version
+
+    - name: DockerHub Login
+      id: dkr
       if: |
         github.event_name == 'push' && (
           github.ref == 'refs/heads/develop'
@@ -94,8 +95,17 @@ jobs:
         if [ -n "${{ secrets.DockerPassword }}" ]; then
            echo "Login to DockerHub as ${DOCKER_USER}"
            echo "${{ secrets.DockerPassword }}" | docker login -u "${DOCKER_USER}" --password-stdin
-           docker push ${ORG}/${IMAGE}:${BUILDER_TAG}
-           docker push ${ORG}/${IMAGE}:latest
+           echo "::set-output name=logged_in::yes"
         else
            echo "Set DockerPassword secret to push to docker"
         fi
+
+    - name: DockerHub Push
+      if: |
+        github.event_name == 'push' && (
+          github.ref == 'refs/heads/develop'
+          ) && steps.dkr.outputs.logged_in == 'yes'
+      run: |
+        if [ -n "${{ secrets.DockerPassword }}" ]; then
+           docker push "${{ steps.cfg.outputs.docker_image }}"
+        fi