Skip to content

fix #10963 #10964

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix #10963 #10964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c069f35
fix #10963
NyakudyaA Apr 24, 2023
172ca54
add geoserver data dir path in env files
NyakudyaA Apr 29, 2023
efb08e6
fix #10963
NyakudyaA Apr 24, 2023
eb1c400
add geoserver data dir path in env files
NyakudyaA Apr 29, 2023
a5d2a71
Merge remote-tracking branch 'origin/geodatadir' into geodatadir
NyakudyaA Apr 29, 2023
924a6ad
Merge branch 'master' into geodatadir
afabiani May 15, 2023
1cac5f8
Merge branch 'master' into geodatadir
afabiani May 23, 2023
f083f78
Merge branch 'master' into geodatadir
NyakudyaA Jul 2, 2023
32b17fb
address comment in PR
NyakudyaA Jul 2, 2023
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
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
GEOSERVER_ADMIN_USER=admin
GEOSERVER_ADMIN_PASSWORD=geoserver
GEOSERVER_DATA_DIR=/geoserver_data/data

OGC_REQUEST_TIMEOUT=30
OGC_REQUEST_MAX_RETRIES=1
Expand Down
1 change: 1 addition & 0 deletions .env_dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEOSERVER_PUBLIC_LOCATION=http://localhost:8080/geoserver/
GEOSERVER_LOCATION=http://localhost:8080/geoserver/
GEOSERVER_ADMIN_USER=admin
GEOSERVER_ADMIN_PASSWORD=geoserver
GEOSERVER_DATA_DIR=/geoserver_data/data

OGC_REQUEST_TIMEOUT=60
OGC_REQUEST_MAX_RETRIES=0
Expand Down
1 change: 1 addition & 0 deletions .env_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEOSERVER_PUBLIC_LOCATION=http://localhost:8080/geoserver/
GEOSERVER_LOCATION=http://localhost:8080/geoserver/
GEOSERVER_ADMIN_USER=admin
GEOSERVER_ADMIN_PASSWORD=geoserver
GEOSERVER_DATA_DIR=/geoserver_data/data

OGC_REQUEST_TIMEOUT=30
OGC_REQUEST_MAX_RETRIES=1
Expand Down
1 change: 1 addition & 0 deletions .env_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
GEOSERVER_ADMIN_USER=admin
GEOSERVER_ADMIN_PASSWORD=geoserver
GEOSERVER_DATA_DIR=/geoserver_data/data

OGC_REQUEST_TIMEOUT=5
OGC_REQUEST_MAX_RETRIES=0
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-geoserver-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
org.geonode.instance.name: geonode
command: /bin/true
volumes:
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}

geoserver:
image: geonode/geoserver:2.23.0
Expand All @@ -24,7 +24,7 @@ services:
depends_on:
- data-dir-conf
volumes:
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
env_file:
- .env
ports:
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-common-django:
volumes:
# - '.:/usr/src/geonode'
- statics:/mnt/volumes/statics
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
- backup-restore:/backup_restore
- data:/data
- tmp:/tmp
Expand Down Expand Up @@ -101,7 +101,7 @@ services:
- .env_test
volumes:
- statics:/mnt/volumes/statics
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
- backup-restore:/backup_restore
- data:/data
- tmp:/tmp
Expand All @@ -117,10 +117,10 @@ services:
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The image geonode/geoserver_data:${VERSION} will need to be adjusted if we intend it to be generic as per the env variable ${GEOSERVER_DATA_DIR}, Currently it also hard codes the path /geoserver_data/data so that's why I was reluctant to change it here unless we fix the upstream image. In my case, I am downloading the data directory as part of the GeoServer entrypoint.sh using download.sh and then mounting it to a specific path defined by ${GEOSERVER_DATA_DIR}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will take a look and manage to see if the upstream image is customizable too

restart: on-failure
healthcheck:
test: "ls -A '/geoserver_data/data' | wc -l"
test: "ls -A '${GEOSERVER_DATA_DIR}' | wc -l"

# PostGIS database.
db:
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-common-django:
volumes:
# - '.:/usr/src/geonode'
- statics:/mnt/volumes/statics
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
- backup-restore:/backup_restore
- data:/data
- tmp:/tmp
Expand Down Expand Up @@ -101,7 +101,7 @@ services:
- .env
volumes:
- statics:/mnt/volumes/statics
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
- backup-restore:/backup_restore
- data:/data
- tmp:/tmp
Expand All @@ -117,10 +117,10 @@ services:
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
- geoserver-data-dir:/geoserver_data/data
- geoserver-data-dir:${GEOSERVER_DATA_DIR}
restart: on-failure
healthcheck:
test: "ls -A '/geoserver_data/data' | wc -l"
test: "ls -A '${GEOSERVER_DATA_DIR}' | wc -l"

# PostGIS database.
db:
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def prepare(ctx):
new_ext_ip = os.environ["SITEURL"]
client_id = os.environ["OAUTH2_CLIENT_ID"]
client_secret = os.environ["OAUTH2_CLIENT_SECRET"]
oauth_config = "/geoserver_data/data/security/filter/geonode-oauth2/config.xml"
oauth_config = f"{os.environ['GEOSERVER_DATA_DIR']}/security/filter/geonode-oauth2/config.xml"
ctx.run(f'sed -i "s|<cliendId>.*</cliendId>|<cliendId>{client_id}</cliendId>|g" {oauth_config}', pty=True)
ctx.run(
f'sed -i "s|<clientSecret>.*</clientSecret>|<clientSecret>{client_secret}</clientSecret>|g" {oauth_config}',
Expand Down