Attempt to fix s3 endpoint host and port handling

chart/geosphere-mapserver/templates/deployment.yaml

@@ -80,7 +80,12 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: "{{ .Values.imageSource.s3ConfigMap }}"
-                  key: "{{ .Values.imageSource.s3EndpointHostKey }}:{{ .Values.imageSource.s3EndpointPortKey }}"
+                  key: "{{ .Values.imageSource.s3EndpointHostKey }}"
+            - name: "AWS_S3_ENDPOINT_PORT"
+              valueFrom:
+                configMapKeyRef:
+                  name: "{{ .Values.imageSource.s3ConfigMap }}"
+                  key: "{{ .Values.imageSource.s3EndpointHostPortKey }}"
             {{- else }}
             - name: "AWS_S3_ENDPOINT"
               value: "{{ .Values.imageSource.s3Endpoint }}"

ci/test_mapserver_image.sh

@@ -76,7 +76,7 @@ start_pg_test_container() {
 }
 
 start_s3_pg_test_container() {
-    start_pg_test_container -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} -e AWS_S3_ENDPOINT="${MINIO_SERVER_NAME}:9000"
+    start_pg_test_container -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} -e AWS_S3_ENDPOINT="${MINIO_SERVER_NAME}" -e AWS_S3_ENDPOINT_PORT="9000"
 }
 
 start_postgres() {

mapserver/run.sh

@@ -13,6 +13,10 @@ replace_pg_params() {
 # Load environment variable options to overwrite in the config
 export LAYER_BASE_DIR=${LAYER_BASE_DIR:-"/data/tiles"}
 
+if [[ -n ${AWS_S3_ENDPOINT} ]] && [[ -n ${AWS_S3_ENDPOINT_PORT} ]]; then
+    export AWS_S3_ENDPOINT="${AWS_S3_ENDPOINT}:${AWS_S3_ENDPOINT_PORT}"
+fi
+
 # Update the mapcache.xml file with the real host and port name
 mf_tmpl="/work/abi_l1b_template.map"