Merge branch 'feature-geo2grid-1.0.2' into 'master'

Update geo2grid container to 1.0.2b0 tarball

See merge request cspp_geo/cspp-geo-web-viewer!21

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 image: "${CI_REGISTRY_IMAGE}/cibuild:19.03.1"
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
-  IMAGES_TO_BUILD: "cspp_geo_grb cspp_geo_grb_notify tests/cspp_geo_grb_sender"
+  IMAGES_TO_BUILD: "cspp_geo_grb cspp_geo_grb_notify cspp_geo_geo2grid tests/cspp_geo_grb_sender"
 services:
   - docker:19.03.1-dind
 workflow:
@@ -15,13 +15,16 @@ workflow:
     # don't build tags right now
     - if: $CI_COMMIT_TAG
       when: never
-    - if: $CI_MERGE_REQUEST_ID
+    - if: $CI_MERGE_REQUEST_REF_PATH
+      when: never
+    - if: $CI_PROJECT_NAMESPACE == "cspp_geo"
       when: never
     - when: always
 
 before_script:
   - docker info
   - docker login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
+  - export
 
 build_cspp_geo_grb:
   stage: build_image

cspp_geo_geo2grid/Dockerfile

@@ -9,10 +9,10 @@ WORKDIR /work
 #    tar -xzf CSPP_GEO2GRID_V1.0.0.tar.gz -C geo2grid --strip-components=1 && \
 #    rm CSPP_GEO2GRID_V1.0.0.tar.gz
 # Beta release
-RUN curl -O ftp://ftp.ssec.wisc.edu/pub/CSPP/hidden/GEO/GEO2GRID/v1_0_1/CSPP_GEO2GRID_V1.0.1.tar.gz && \
+RUN curl -O ftp://ftp.ssec.wisc.edu/pub/davidh/geo2grid-swbundle-1.0.2b0.tar.gz && \
     mkdir -p geo2grid && \
-    tar -xzf CSPP_GEO2GRID_V1.0.1.tar.gz -C geo2grid --strip-components=1 && \
-    rm CSPP_GEO2GRID_V1.0.1.tar.gz
+    tar -xzf geo2grid-swbundle-1.0.2b0.tar.gz -C geo2grid --strip-components=1 && \
+    rm *.tar.gz
 
 RUN yum install -y unzip time && \
     curl -LO http://ssec.wisc.edu/~rayg/pub/amqpfind.zip && \