Squashing commits

Bump pyopenssl from 22.0.0 to 22.1.0 (GeoNode#10049) Bumps [pyopenssl](https://github.com/pyca/pyopenssl) from 22.0.0 to 22.1.0. - [Release notes](https://github.com/pyca/pyopenssl/releases) - [Changelog](https://github.com/pyca/pyopenssl/blob/main/CHANGELOG.rst) - [Commits](pyca/pyopenssl@22.0.0...22.1.0) --- updated-dependencies: - dependency-name: pyopenssl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alessio Fabiani <[email protected]> Bump djangorestframework from 3.12.0 to 3.14.0 (GeoNode#10048) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.0 to 3.14.0. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](encode/django-rest-framework@3.12.0...3.14.0) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Revert "Bump djangorestframework from 3.12.0 to 3.14.0 (GeoNode#10048)" (GeoNode#10062) This reverts commit 7556656. [Dependencies] Align setup.cfg with requirements.txt (GeoNode#10061) * [Dependencies] Align setup.cfg with requirements.txt * Revert "Bump djangorestframework from 3.12.0 to 3.14.0" [CLA] Add "edsonflavio" to .clabot Complete Translate pt_BR (GeoNode#10056) Tradução completa da localização para Português Brasileiro. Complete translate for pt_BR localization. Co-authored-by: Alessio Fabiani <[email protected]> [Fixes GeoNode#10041] Review the thumbnail scaling process (GeoNode#10046) * -[Fixes GeoNode#10040] Remove auto-generated thumbnail for documents * - update thumbnail pixels * - add tests * - fix-tests * - fix-tests [Fixes GeoNode#10066][Depencendies] Security audit and checks (GeoNode#10067) * [Fixes GeoNode#10066][Depencendies] Security audit and checks * -SNYK security fix [Fixes GeoNode#10055] Modify Metadata form with permissions check (GeoNode#10057) * -[Fixes GeoNode#10055] Modify Metadata form with permissions check * - check user in form * - update tests * - add tests Co-authored-by: Giovanni Allegri <[email protected]> Bump django-mptt from 0.13.4 to 0.14.0 (GeoNode#10081) Bumps [django-mptt](https://github.com/django-mptt/django-mptt) from 0.13.4 to 0.14.0. - [Release notes](https://github.com/django-mptt/django-mptt/releases) - [Changelog](https://github.com/django-mptt/django-mptt/blob/main/CHANGELOG.rst) - [Commits](django-mptt/django-mptt@0.13.4...0.14) --- updated-dependencies: - dependency-name: django-mptt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> [Fixes GeoNode#10070] Let the resource manager handle also raw sld (GeoNode#10071) * [Fixes GeoNode#10070] Let the resource manager handle also raw sld * [Fixes GeoNode#10070] Let the resource manager handle also raw sld * [Fixes GeoNode#10070] Let the resource manager handle also raw sld Update django-invitations requirement from <1.9.4 to <2.0.1 (GeoNode#10084) * Update django-invitations requirement from <1.9.4 to <2.0.1 Updates the requirements on [django-invitations](https://github.com/jazzband/django-invitations) to permit the latest version. - [Release notes](https://github.com/jazzband/django-invitations/releases) - [Changelog](https://github.com/jazzband/django-invitations/blob/master/CHANGELOG.md) - [Commits](jazzband/django-invitations@0.1...2.0.0) --- updated-dependencies: - dependency-name: django-invitations dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * - fix the adapter Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: afabiani <[email protected]> fix: requirements.txt to reduce vulnerabilities (GeoNode#10099) The following vulnerabilities are fixed by pinning transitive dependencies: - https://snyk.io/vuln/SNYK-PYTHON-DJANGO-3039675 Bump drf-spectacular from 0.24.1 to 0.24.2 (GeoNode#10088) Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.24.1 to 0.24.2. - [Release notes](https://github.com/tfranzel/drf-spectacular/releases) - [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst) - [Commits](tfranzel/drf-spectacular@0.24.1...0.24.2) --- updated-dependencies: - dependency-name: drf-spectacular dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alessio Fabiani <[email protected]> Bump invoke from 1.7.1 to 1.7.3 (GeoNode#10086) Bumps [invoke](https://github.com/pyinvoke/invoke) from 1.7.1 to 1.7.3. - [Release notes](https://github.com/pyinvoke/invoke/releases) - [Commits](pyinvoke/invoke@1.7.1...1.7.3) --- updated-dependencies: - dependency-name: invoke dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Lokalno Lokalno 1 Bez .env
labepn · Dec 26, 2022 · f1d6f9d · f1d6f9d
1 parent 41b102e
commit f1d6f9d
Show file tree

Hide file tree

Showing 108 changed files with 145,886 additions and 7,830 deletions.
diff --git a/.clabot b/.clabot
@@ -64,6 +64,7 @@
     "mikesname",
     "DavidQuartz",
     "jkariukidev",
-    "mwallschlaeger"
+    "mwallschlaeger",
+    "edsonflavio"
   ]
 }
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -95,3 +95,5 @@ scripts/spcgeonode/_volume_*
 # Docker Hub hooks
 !hooks/*
 
+.env
+geonode/people/migrations/
diff --git a/Dockerfile b/Dockerfile
@@ -66,17 +66,37 @@ RUN chmod +x /usr/bin/celery-commands
 COPY celery-cmd /usr/bin/celery-cmd
 RUN chmod +x /usr/bin/celery-cmd
 
-# # Install "geonode-contribs" apps
-# RUN cd /usr/src; git clone https://github.com/GeoNode/geonode-contribs.git -b master
-# # Install logstash and centralized dashboard dependencies
-# RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade  -e . \
+# Install "geonode-contribs" apps
+RUN cd /usr/src; git clone https://github.com/labepn/geonode-contribs.git
+#RUN cd /usr/src; git clone https://github.com/GeoNode/geonode-contribs.git -b master
+# Install logstash and centralized dashboard dependencies
+RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade -e .
+#RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade  -e . \
 #     cd /usr/src/geonode-contribs/ldap; pip install --upgrade  -e .
 
 RUN pip install --upgrade --no-cache-dir  --src /usr/src -r requirements.txt
 RUN pip install --upgrade  -e .
 
 # Cleanup apt update lists
 RUN rm -rf /var/lib/apt/lists/*
+# Change language - added by Mirko
+#COPY ./plugin-proba/* /usr/src/
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/hr/*
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/sr/*
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/__init__.py
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/sr/__pycache__/*
+COPY ./izmene-django/hr/* /usr/local/lib/python3.10/site-packages/django/conf/locale/hr/
+COPY ./izmene-django/sr/* /usr/local/lib/python3.10/site-packages/django/conf/locale/sr/
+COPY ./izmene-django/__init__.py /usr/local/lib/python3.10/site-packages/django/conf/locale/
+COPY ./izmene-django/__pycache__/* /usr/local/lib/python3.10/site-packages/django/conf/locale/__pycache__/
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/contrib/admin/locale/hr/*
+COPY ./izmene-django-admin/* /usr/local/lib/python3.10/site-packages/django/contrib/admin/locale/hr/
+#RUN rm -rf /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/footer.html
+#COPY ./izmene-django/footer.html /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/
+#RUN rm -rf /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html
+#COPY ./izmene-django/brand_navbar.html /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/
+#RUN rm -rf /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/search_bar.html
+#COPY ./izmene-django/search_bar.html /usr/src/django-geonode-mapstore-client/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/
 
 # Export ports
 EXPOSE 8000

diff --git a/Dockerfile.save b/Dockerfile.save
@@ -0,0 +1,92 @@
+FROM python:3.10.2-buster
+LABEL GeoNode development team
+
+RUN mkdir -p /usr/src/geonode
+
+# Enable postgresql-client-13
+RUN apt-get update -y && apt-get install curl wget unzip -y
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
+RUN echo "deb http://deb.debian.org/debian/ stable main contrib non-free" | tee /etc/apt/sources.list.d/debian.list
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+
+# To get GDAL 3.2.1 to fix this issue https://github.com/OSGeo/gdal/issues/1692
+# TODO: The following line should be removed if base image upgraded to Bullseye
+RUN echo "deb http://deb.debian.org/debian/ bullseye main contrib non-free" | tee /etc/apt/sources.list.d/debian.list
+
+# This section is borrowed from the official Django image but adds GDAL and others
+RUN apt-get update -y && apt-get upgrade -y
+
+# Prepraing dependencies
+RUN apt-get install -y \
+    libgdal-dev libpq-dev libxml2-dev \
+    libxml2 libxslt1-dev zlib1g-dev libjpeg-dev \
+    libmemcached-dev libldap2-dev libsasl2-dev libffi-dev
+
+RUN apt-get install -y --no-install-recommends \
+    gcc zip gettext geoip-bin cron \
+    postgresql-client-13 \
+    sqlite3 spatialite-bin libsqlite3-mod-spatialite \
+    python3-all-dev python3-dev \
+    python3-gdal python3-psycopg2 python3-ldap \
+    python3-pip python3-pil python3-lxml python3-pylibmc \
+    uwsgi uwsgi-plugin-python3 \
+    firefox-esr
+
+RUN apt-get install -y devscripts build-essential debhelper pkg-kde-tools sharutils
+# RUN git clone https://salsa.debian.org/debian-gis-team/proj.git /tmp/proj
+# RUN cd /tmp/proj && debuild -i -us -uc -b && dpkg -i ../*.deb
+
+# Install pip packages
+RUN pip3 install uwsgi \
+    && pip install pip --upgrade \
+    && pip install pygdal==$(gdal-config --version).* flower==0.9.4
+
+# Activate "memcached"
+RUN apt-get install -y memcached
+RUN pip install pylibmc sherlock
+
+# add bower and grunt command
+COPY . /usr/src/geonode/
+WORKDIR /usr/src/geonode
+
+COPY monitoring-cron /etc/cron.d/monitoring-cron
+RUN chmod 0644 /etc/cron.d/monitoring-cron
+RUN crontab /etc/cron.d/monitoring-cron
+RUN touch /var/log/cron.log
+RUN service cron start
+
+COPY wait-for-databases.sh /usr/bin/wait-for-databases
+RUN chmod +x /usr/bin/wait-for-databases
+RUN chmod +x /usr/src/geonode/tasks.py \
+    && chmod +x /usr/src/geonode/entrypoint.sh
+
+COPY celery.sh /usr/bin/celery-commands
+RUN chmod +x /usr/bin/celery-commands
+
+COPY celery-cmd /usr/bin/celery-cmd
+RUN chmod +x /usr/bin/celery-cmd
+
+# # Install "geonode-contribs" apps
+# RUN cd /usr/src; git clone https://github.com/GeoNode/geonode-contribs.git -b master
+# # Install logstash and centralized dashboard dependencies
+# RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade  -e . \
+#     cd /usr/src/geonode-contribs/ldap; pip install --upgrade  -e .
+
+RUN pip install --upgrade --no-cache-dir  --src /usr/src -r requirements.txt
+RUN pip install --upgrade  -e .
+
+# Cleanup apt update lists
+RUN rm -rf /var/lib/apt/lists/*
+# Change language - added by Mirko
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/hr/*
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/conf/locale/sr/*
+COPY ./izmene-django/hr/* /usr/local/lib/python3.10/site-packages/django/conf/locale/hr
+COPY ./izmene-django/sr/* /usr/local/lib/python3.10/site-packages/django/conf/locale/sr
+RUN rm -rf /usr/local/lib/python3.10/site-packages/django/contrib/admin/locale/hr/*
+COPY ./izmene-django-admin/* /usr/local/lib/python3.10/site-packages/django/contrib/admin/locale/hr//usr/local/lib/python3.10/site-packages/django/contrib/admin/locale/hr/
+
+# Export ports
+EXPOSE 8000
+
+# We provide no command or entrypoint as this image can be used to serve the django project or run celery tasks
+# ENTRYPOINT /usr/src/geonode/entrypoint.sh