Skip to content

Commit

Permalink
Merge pull request #148 from zalf-rdm/issue_#107_Task_revert_changes_…
Browse files Browse the repository at this point in the history
…regarding_geoserver_entrypoint_overloading_gefence_file

[Fixes #107] Task: revert changes regarding geoserver entrypoint overloading gefence file
  • Loading branch information
ridoo committed Feb 27, 2024
2 parents a836e56 + e607570 commit f6b4313
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespac

## Delete Installation
```bash
helm delete --namespace geonode geonode charts/geonode
helm delete --namespace geonode geonode geonode
```

## Contribution
Expand Down
9 changes: 0 additions & 9 deletions charts/geonode/templates/geoserver/geoserver-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,6 @@ spec:
containers:
- name: {{ .Values.geoserver.container_name }}
image: "{{ .Values.geoserver.image.name }}:{{ .Values.geoserver.image.tag }}"
# temporary overloading entry point to fix j2 template: https://github.com/GeoNode/geonode/issues/11318
command:
- sh
- -c
- |
TMP_DB_PORT={{ include "database_port" . }}
{{`sed -i 's/db:5432/{{ DATABASE_HOST }}:$TMP_DB_PORT/g' /templates/geofence/geofence-datasource-ovr.properties.j2`}}
/usr/local/tomcat/tmp/entrypoint.sh
ports:
- containerPort: {{ .Values.geoserver.port }}

Expand Down

0 comments on commit f6b4313

Please sign in to comment.