Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 4.2.0 #11827

Merged
merged 3 commits into from
Jan 10, 2024
Merged

Release 4.2.0 #11827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e9f88
Bump client to 4.2.0 and importer to version 1.0.6
giohappy Jan 10, 2024
a25ad1c
Bump version to 4.2.0
giohappy Jan 10, 2024
3b5b907
fixed docker image tags for test and dev compose files
giohappy Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:

# Nginx is serving django static and media files and proxies to django and geonode
geonode:
image: geonode/nginx:latest
image: geonode/nginx:1.25.3-v1
build: ./scripts/docker/nginx/
container_name: nginx4${COMPOSE_PROJECT_NAME}
env_file:
Expand All @@ -70,7 +70,7 @@ services:

# Gets and installs letsencrypt certificates
letsencrypt:
image: geonode/letsencrypt:latest
image: geonode/letsencrypt:2.6.0-v1
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
env_file:
- .env
Expand All @@ -80,7 +80,7 @@ services:

# Geoserver backend
geoserver:
image: geonode/geoserver:latest
image: geonode/geoserver:2.23.3-v1
container_name: geoserver4${COMPOSE_PROJECT_NAME}
healthcheck:
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
Expand All @@ -106,7 +106,7 @@ services:
condition: service_healthy

data-dir-conf:
image: geonode/geoserver_data:latest
image: geonode/geoserver_data:2.23.3-v1
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
Expand All @@ -118,7 +118,7 @@ services:
# PostGIS database.
db:
# use geonode official postgis 15 image
image: geonode/postgis:latest
image: geonode/postgis:15.3-v1
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
container_name: db4${COMPOSE_PROJECT_NAME}
env_file:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:

# Nginx is serving django static and media files and proxies to django and geonode
geonode:
image: geonode/nginx:latest
image: geonode/nginx:1.25.3-v1
container_name: nginx4${COMPOSE_PROJECT_NAME}
env_file:
- .env_test
Expand Down Expand Up @@ -82,7 +82,7 @@ services:

# Gets and installs letsencrypt certificates
letsencrypt:
image: geonode/letsencrypt:latest
image: geonode/letsencrypt:2.6.0-v1
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
env_file:
- .env_test
Expand All @@ -92,7 +92,7 @@ services:

# Geoserver backend
geoserver:
image: geonode/geoserver:latest
image: geonode/geoserver:2.23.3-v1
container_name: geoserver4${COMPOSE_PROJECT_NAME}
healthcheck:
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
Expand All @@ -118,7 +118,7 @@ services:
condition: service_healthy

data-dir-conf:
image: geonode/geoserver_data:latest
image: geonode/geoserver_data:2.23.3-v1
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
Expand All @@ -130,7 +130,7 @@ services:
# PostGIS database.
db:
# use geonode official postgis 15 image
image: geonode/postgis:latest
image: geonode/postgis:15.3-v1
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
container_name: db4${COMPOSE_PROJECT_NAME}
env_file:
Expand Down
2 changes: 1 addition & 1 deletion geonode/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import os

__version__ = (4, 2, 0, "dev", 0)
__version__ = (4, 2, 0, "final", 0)


default_app_config = "geonode.apps.AppConfig"
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ pinax-notifications==6.0.0
pinax-ratings==4.0.0

# GeoNode org maintained apps.
# django-geonode-mapstore-client==4.0.5
-e git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client
-e git+https://github.com/GeoNode/geonode-importer.git@master#egg=geonode-importer
django-geonode-mapstore-client==4.2.0
geonode-importer==1.0.6
django-avatar==7.1.1
geonode-oauth-toolkit==2.2.2
geonode-user-messages==2.0.2
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ install_requires =
pinax-ratings==4.0.0

# GeoNode org maintained apps.
django-geonode-mapstore-client>=4.0.5,<5.0.0
geonode-importer>=1.0.2
django-geonode-mapstore-client==4.2.0
geonode-importer==1.0.6
django-avatar==7.1.1
geonode-oauth-toolkit==2.2.2
geonode-user-messages==2.0.2
Expand Down
Loading