Skip to content

Commit 1dfd6a5

Browse files
mattiagiupponigiohappy
authored andcommitted
Minor fix on BR procedure
1 parent 5055f92 commit 1dfd6a5

4 files changed

Lines changed: 23 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM geonode/geonode-base:latest-ubuntu-24.04
22
RUN mkdir -p /usr/src/project
33

4-
RUN apt-get update -y && apt-get install curl wget unzip gnupg2 locales -y
4+
RUN apt-get update -y && apt-get install curl wget unzip gnupg2 locales netcat-openbsd -y
55

66
RUN sed -i -e 's/# C.UTF-8 UTF-8/C.UTF-8 UTF-8/' /etc/locale.gen && \
77
locale-gen

src/geonode_project/br/restore.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ if md5sum -c /$BKP_FOLDER_NAME/$NEW_UUID/$BKP_FILE_NAME.md5; then
7575
./manage.sh migrate_baseurl -f --source-address=$SOURCE_URL --target-address=$TARGET_URL
7676
./manage.sh create_tile_layers -f
7777
./manage.sh set_all_datasets_metadata -d -i
78+
echo "-----------------------------------------------------"
79+
echo " Fixup GeoServer styles"
80+
echo "-----------------------------------------------------"
81+
XML_FILE="/geoserver_data/data/workspaces/geonode/workspace.xml"
82+
ID_VALUE=$(sed -n 's|.*<id>\(.*\)</id>.*|\1|p' "$XML_FILE")
83+
find /geoserver_data/data/workspaces/geonode/styles -type f -name "*.xml" -exec sed -i "s|<name>geonode</name>|<id>$ID_VALUE</id>|g" {} +
84+
echo " GeoServer reloading catalog"
85+
curl -w "%{http_code}\n" -u $GEOSERVER_ADMIN_USER:$GEOSERVER_ADMIN_PASSWORD -X POST "http://geoserver:8080/geoserver/rest/reload"
86+
echo "-----------------------------------------------------"
87+
echo " Geoserver Styles fixup completed"
88+
echo "-----------------------------------------------------"
89+
echo "-----------------------------------------------------"
90+
echo " Cleanup memcached"
91+
echo "-----------------------------------------------------"
92+
echo "flush_all" | nc -q 1 memcached 11211
93+
echo "-----------------------------------------------------"
94+
echo "Cache cleanup done"
95+
echo "-----------------------------------------------------"
7896
else
7997
# The MD5 sum didn't match
8098
echo "-----------------------------------------------------"

src/geonode_project/br/settings_docker.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dumprasterdata = yes
1313
# data_layername_exclude_filter = {comma separated list of layernames, optionally with glob syntax} e.g.: tuscany_*,italy
1414

1515
[fixtures]
16-
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
17-
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
16+
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,resource,upload,geonode_themes,geoapps,favorite,geonode_client
17+
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,resource,upload,geonode_themes,geoapps,favorite,geonode_client

src/manage.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
. $HOME/.override_env
2+
/usr/src/venv/bin/python /usr/src/geonode_project/manage.py $@

0 commit comments

Comments
 (0)