Skip to content
Merged
2 changes: 1 addition & 1 deletion .containers/coatjava.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ ARG REF_NAME=development
# build coatjava
RUN java --version && cd /opt && \
git clone https://code.jlab.org/hallb/alert/coatjava.git && cd coatjava && \
git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh
git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh --quiet
28 changes: 28 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,34 @@ coatjava_build:
--dockerfile $CI_PROJECT_DIR/.containers/coatjava.Dockerfile
--destination $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
--build-arg REF_NAME=${CI_COMMIT_REF_NAME}

coatjava_dind_build:
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
tags:
- "silicon"
when: manual
allow_failure: true
script:
- echo "${CI_COMMIT_REF_NAME}"
- >
docker build --build-arg REF_NAME=${CI_COMMIT_REF_NAME} \
-f .containers/coatjava.Dockerfile \
-t $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME} .
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
- docker push $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME}


print_help:
image: $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
needs: ["coatjava_build"]
script:
- export PATH=/opt/coatjava/coatjava/bin:$PATH
- source /opt/coatjava/coatjava/libexec/env.sh
- ls -lrth
- printenv
- decoder -help || true
- recon-util -help || true


alert_testing:
needs: ["coatjava_build"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ public static JsonObject Map2Json(Map<String,Object> map) {
ret.add(topKey,Map2Json((Map)entry.getValue()));
}
else {
ret.add(topKey, entry.getValue().toString());
if(entry.getValue() != null) {
ret.add(topKey, entry.getValue().toString());
}
}
}
return ret;
Expand Down