Commit a88f86c1 authored by MANISH KUMAR's avatar MANISH KUMAR
Browse files

Merge branch 'container_hardening_fix' into 'master'

Removing PreAgg metrics

See merge request !224
parents 8c54fdb5 93d2bb19
Pipeline #37959 passed with stages
in 19 seconds
......@@ -147,10 +147,8 @@ azure_containerize:
echo 'FROM community.opengroup.org:5555/osdu/platform/deployment-and-operations/base-containers-azure/alpine-zulu8:0.0.1
VOLUME /tmp
ARG JAR_FILE
ARG APPINSIGHTS_KEY
ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${APPINSIGHTS_KEY}
COPY ${JAR_FILE} app.jar
ENTRYPOINT ["java","-jar","-javaagent:/opt/agents/applicationinsights-agent-${AGENT_VERSION}.jar","/app.jar"]' > Dockerfile
ENTRYPOINT ["java","-jar","/app.jar"]' > Dockerfile
- |
if [ "$AZURE_SERVICE" == "entitlements" ]; then
TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' |head -n 1)
......@@ -160,7 +158,7 @@ azure_containerize:
# Gitlab Container Registry
- echo "Startup Jar is $TARGET"
- docker build --build-arg JAR_FILE=$TARGET --build-arg APPINSIGHTS_KEY=$AZURE_AD_APPINSIGHTS_KEY -t $CI_REGISTRY_IMAGE/$SHA_IMAGE .
- docker build --build-arg JAR_FILE=$TARGET -t $CI_REGISTRY_IMAGE/$SHA_IMAGE .
- docker push ${CI_REGISTRY_IMAGE}/$SHA_IMAGE
- docker tag $CI_REGISTRY_IMAGE/$SHA_IMAGE $CI_REGISTRY_IMAGE/$LATEST_IMAGE
- docker push ${CI_REGISTRY_IMAGE}/$LATEST_IMAGE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment