Version 1.1.0

kartoza · Jan 25, 2021 · ce82196 · ce82196
2 parents ae37c3b + 6c83415
commit ce82196
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 60 deletions.
diff --git a/.github/workflows/build-push-images-latest.yaml b/.github/workflows/build-push-images-latest.yaml
@@ -0,0 +1,39 @@
+name: latest-build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - develop
+jobs:
+  docker-builder:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis
+          tag-match: \d{1,3}.\d{1,3}.\d{1,3}
+          tag-semver: true
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: deployment/docker/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis:latest
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/build-push-images-pr.yaml b/.github/workflows/build-push-images-pr.yaml
@@ -0,0 +1,39 @@
+name: pr-build
+on:
+  pull_request:
+    branches:
+      - develop
+jobs:
+  docker-builder:
+    if: github.event.pull_request.head.repo.fork == 'false'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis
+          tag-match: \d{1,3}.\d{1,3}.\d{1,3}
+          tag-semver: true
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: deployment/docker/Dockerfile
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/build-push-images-release.yaml b/.github/workflows/build-push-images-release.yaml
@@ -0,0 +1,76 @@
+name: release-build
+on:
+  workflow_dispatch:
+    inputs:
+      tags:
+        description: 'Git tag to use'
+  release:
+    types:
+      - released
+  push:
+    tags:
+      - '*.*.*.'
+      - 'v*.*.*.'
+jobs:
+  docker-builder-run-on-tag:
+    if: ${{ github.event.inputs.tags }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.inputs.tags }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: deployment/docker/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis:${{ github.event.inputs.tags }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+  docker-builder-run-on-tag-release:
+    if: ${{ !github.event.inputs.tags }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis
+          tag-match: \d{1,3}.\d{1,3}.\d{1,3}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: deployment/docker/Dockerfile
+          push: true
+          tags: ${{ steps.docker_meta.outputs.tags }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/build-push-images-stable.yaml b/.github/workflows/build-push-images-stable.yaml
@@ -0,0 +1,32 @@
+name: stable-build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - main
+jobs:
+  docker-builder:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: deployment/docker/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_REPO }}/igrac_ggis:stable
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -134,58 +134,14 @@ services:
   celery:
     <<: *default-common-django
     command: 'celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG --concurrency=10 -n worker1@%h'
-  # Celery beat that triggers scheduled tasks
-
-  celerybeat:
-    <<: *default-common-django
-    command: 'celery beat --app=geonode.celery_app:app --pidfile="/celerybeat.pid" -l debug'
-
-  # Celery camera that monitors celery tasks and populate the djcelery django admin interface
-  celerycam:
-    <<: *default-common-django
-    command: 'celery events --app=geonode.celery_app:app --pidfile="/celeryev.pid" --camera=django_celery_monitor.camera.Camera --frequency=2.0 -l debug'
-
-  #  # Gets and installs letsencrypt certificates
-  #  letsencrypt:
-  #    image: geonode/spcgeonode:letsencrypt-3.0
-  #    environment:
-  #      - HTTPS_HOST=${HTTPS_HOST}
-  #      - HTTP_HOST=${HTTP_HOST}
-  #      - ADMIN_EMAIL=${ADMIN_EMAIL}
-  #      - LETSENCRYPT_MODE=${LETSENCRYPT_MODE}
-  #    volumes:
-  #      - certificates:/spcgeonode-certificates/
-  #    restart: on-failure
-  #
-  #  # dumps the non geodata db
-  #  pgdumper_nogeo:
-  #    container_name: dumper_${GEONODE_DATABASE}_${COMPOSE_PROJECT_NAME}
-  #    image: geonode/spcgeonode:pgdumper-3.0
-  #    volumes:
-  #      - pgdumps:/spcgeonode-pgdumps/
-  #    restart: on-failure
-  #    environment:
-  #      - DATABASE=${GEONODE_DATABASE}
-  #      - DATABASE_URL=postgres://${GEONODE_DATABASE_USER}:${GEONODE_DATABASE_PASSWORD}@postgres:5432/${GEONODE_DATABASE}
-  #
-  #  # dumps the geodata db
-  #  pgdumper_geo:
-  #    container_name: dumper_${GEONODE_GEODATABASE}_${COMPOSE_PROJECT_NAME}
-  #    image: geonode/spcgeonode:pgdumper-3.0
-  #    volumes:
-  #      - pgdumps:/spcgeonode-pgdumps/
-  #    restart: on-failure
-  #    environment:
-  #      - DATABASE=${GEONODE_GEODATABASE}
-  #      # pgdumper needs postgres:// as connection string for the geodatabase
-  #      - DATABASE_URL=postgres://${GEONODE_GEODATABASE_USER}:${GEONODE_GEODATABASE_PASSWORD}@postgres:5432/${GEONODE_GEODATABASE}
 
   # django application for development
   dev:
     <<: *default-common-django
+    entrypoint: []
     build:
-      context: ./docker/
-      dockerfile: Dockerfile-dev
+      context: ../
+      dockerfile: deployment/docker/Dockerfile-dev
     depends_on:
       - geoserver
       - postgres

diff --git a/django_project/core/settings/base.py b/django_project/core/settings/base.py
@@ -114,5 +114,5 @@
 RESOURCE_PUBLISHING = False
 FREETEXT_KEYWORDS_READONLY = True
 
-UPLOADER['SUPPORTED_CRS'].append('EPSG:54030')
-EPSG_CODE_MATCHES['EPSG:54030'] = '(54030) World_Robinson'
+UPLOADER['SUPPORTED_CRS'].append('ESRI:54030')
+EPSG_CODE_MATCHES['ESRI:54030'] = '(54030) World_Robinson'
diff --git a/django_project/gwml2 b/django_project/gwml2
diff --git a/django_project/igrac/static/css/base-igrac.css b/django_project/igrac/static/css/base-igrac.css
@@ -4,17 +4,17 @@ html {
 
 body.igrac-home {
     padding-top: 51px;
-    background: #fff;
+    background: #f6f6f6;
     color: #797979;
     line-height: 1.3;
     min-height: 100%;
 }
 
 .igrac-home #wrap {
-    margin-top: 0 !important;
     height: 100%;
     background: #f6f6f6;
     padding-bottom: 80px !important;
+    position: relative;
 }
 
 .igrac-home #wrap a:link, .igrac-home #wrap a:visited {
@@ -28,10 +28,6 @@ body.igrac-home {
     font-weight: 700;
 }
 
-.igrac-home #wrap a:hover, .igrac-home #wrap a:focus {
-    text-decoration: underline;
-}
-
 #branding {
     margin: 0;
     padding-left: 15px;
@@ -271,17 +267,55 @@ body.igrac-home {
     overflow-y: auto;
 }
 
-/* Hide scrollbar for Chrome, Safari and Opera */
+/* width */
 .map-abstract::-webkit-scrollbar {
-    display: none;
+    width: 5px;
+    height: 5px;
+    opacity: 0;
+}
+
+.map-abstract:hover::-webkit-scrollbar {
+    opacity: 1;
+}
+
+/* Track */
+.map-abstract::-webkit-scrollbar-track {
+    box-shadow: none;
+    border-radius: 5px;
+}
+
+.map-abstract:hover::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 5px grey;
+}
+
+/* Handle */
+.map-abstract::-webkit-scrollbar-thumb {
+    background: rgba(255, 255, 255, 0);
+    border-radius: 5px;
+}
+
+.map-abstract:hover::-webkit-scrollbar-thumb {
+    background: #ff6b0d;
+}
+
+/* Handle on hover */
+.map-abstract::-webkit-scrollbar-thumb:hover {
+    background: #e05600;
 }
 
 /* Hide scrollbar for IE, Edge and Firefox */
 .map-abstract {
     -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-height: none; /* Firefox */
     scrollbar-width: none; /* Firefox */
 }
 
+.map-abstract:hover {
+    -ms-overflow-style: scrollbar; /* IE and Edge */
+    scrollbar-height: thin; /* Firefox */
+    scrollbar-width: thin; /* Firefox */
+}
+
 .tooltip-inner {
     color: #fff;
     background-color: #797979;
@@ -364,4 +398,8 @@ body.igrac-home {
         padding-left: 15px;
         padding-right: 15px;
     }
+}
+
+.form-actions {
+    margin-bottom: 10px;
 }
diff --git a/django_project/igrac/templates/landing_page.html b/django_project/igrac/templates/landing_page.html
@@ -104,7 +104,7 @@ <h1>{% trans "Explore the viewers" %}</h1>
                             </div>
                             <div class="viewer-desc">
                                 <div class="viewer-title"><strong>{{ map.map.title }}</strong></div>
-                                <div class="map-abstract">{{ map.map.abstract }}</div>
+                                <div class="map-abstract">{{ map.map.abstract|safe|escape|linebreaks|safe }}</div>
                             </div>
                         </a>
                     </div>

diff --git a/django_project/igrac/templates/maps/metadata_detail_article.html b/django_project/igrac/templates/maps/metadata_detail_article.html
@@ -25,7 +25,7 @@ <h2 class="page-title">{{ resource.title }}</h2>
 
         {% if resource.abstract %}
             <dt>{% trans "Abstract" %}</dt>
-            <dd>{{ resource.abstract|safe|escape|urlize|linebreaks|safe|truncatechars:1000 }}</dd>
+            <dd>{{ resource.abstract|safe|escape|urlize|linebreaks|safe }}</dd>
         {% endif %}
 
     </dl>