From d6d11280919b23066ee170465aa51caabf84fbb1 Mon Sep 17 00:00:00 2001 From: "Eldor Pulatov [EPAM/GCP]" <eldor_pulatov@epam.com> Date: Thu, 20 Oct 2022 11:35:13 +0000 Subject: [PATCH] GONRG-5569-Move-bootstrap-to-alpine-images --- NOTICE | 9 +++++++-- devops/gcp/bootstrap-osdu-module/Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index ee086905d..9338eed11 100644 --- a/NOTICE +++ b/NOTICE @@ -21,6 +21,7 @@ The following software have components provided under the terms of this license: - Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl) - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) - Google Guice - Core Library (from https://repo1.maven.org/maven2/com/google/inject/guice) +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -420,6 +421,7 @@ The following software have components provided under the terms of this license: - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) - MapStruct Core (from http://mapstruct.org/mapstruct/, https://repo1.maven.org/maven2/org/mapstruct/mapstruct) - Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core) +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -621,6 +623,7 @@ The following software have components provided under the terms of this license: - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -642,6 +645,7 @@ Beerware ======================================================================== The following software have components provided under the terms of this license: +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -668,6 +672,7 @@ CC-BY-4.0 ======================================================================== The following software have components provided under the terms of this license: +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -838,8 +843,6 @@ The following software have components provided under the terms of this license: ======================================================================== JSON ======================================================================== -The following software have components provided under the terms of this license: - - JSON in Java (from https://github.com/douglascrockford/JSON-java) ======================================================================== @@ -917,6 +920,7 @@ The following software have components provided under the terms of this license: - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt) +- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -1035,6 +1039,7 @@ The following software have components provided under the terms of this license: - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html) - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) +- JSON in Java (from https://github.com/douglascrockford/JSON-java) - Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) diff --git a/devops/gcp/bootstrap-osdu-module/Dockerfile b/devops/gcp/bootstrap-osdu-module/Dockerfile index f8531e604..e487136cd 100644 --- a/devops/gcp/bootstrap-osdu-module/Dockerfile +++ b/devops/gcp/bootstrap-osdu-module/Dockerfile @@ -1,11 +1,11 @@ -FROM google/cloud-sdk:slim +FROM google/cloud-sdk:alpine WORKDIR /opt COPY ./devops/gcp/bootstrap-osdu-module/*.sh ./ COPY ./deployments ./ -RUN apt-get update && apt-get install jq -y +RUN apk update && apk add jq bash py3-pip RUN pip3 install --upgrade pip && pip3 install -r ./scripts/requirements.txt && pip3 install -r ./scripts/gcp-deployment-requirements.txt && pip3 install -r ./scripts/schema-cleaner/requirements.txt RUN chmod +x /opt/bootstrap_schema.sh -- GitLab