[docker] Fix build for mariadb

The mariadb container is failing to build on aarch64 because it's using
an image without arm support. Also standardized the location where the
validation code is cloned.

Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Change-Id: I3bf262ea565e487f635b398d0f49314eceb5162e

diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile
index 7d109bc..a2a1b19 100644 (file)
--- a/docker/mariadb/Dockerfile
+++ b/docker/mariadb/Dockerfile
@@ -14,12 +14,13 @@
 # limitations under the License.                                             #
 ##############################################################################
 
-FROM alpine/git:1.0.7
-RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation/repo
+FROM alpine:latest
+RUN apk --no-cache add --update git
+RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
 
 FROM mariadb:10.4.6
-COPY --from=0 /opt/akraino/validation/repo/ui/db-scripts/EcompSdkDDLMySql_2_4_Common.sql /docker-entrypoint-initdb.d
-COPY --from=0 /opt/akraino/validation/repo/ui/db-scripts/EcompSdkDDLMySql_2_4_OS.sql /docker-entrypoint-initdb.d
-COPY --from=0 /opt/akraino/validation/repo/ui/db-scripts/EcompSdkDMLMySql_2_4_Common.sql /docker-entrypoint-initdb.d
-COPY --from=0 /opt/akraino/validation/repo/ui/db-scripts/EcompSdkDMLMySql_2_4_OS.sql /docker-entrypoint-initdb.d
-COPY --from=0 /opt/akraino/validation/repo/ui/db-scripts/akraino-blueprint_validation_db.sql /docker-entrypoint-initdb.d
+COPY --from=0 /opt/akraino/validation/ui/db-scripts/EcompSdkDDLMySql_2_4_Common.sql /docker-entrypoint-initdb.d
+COPY --from=0 /opt/akraino/validation/ui/db-scripts/EcompSdkDDLMySql_2_4_OS.sql /docker-entrypoint-initdb.d
+COPY --from=0 /opt/akraino/validation/ui/db-scripts/EcompSdkDMLMySql_2_4_Common.sql /docker-entrypoint-initdb.d
+COPY --from=0 /opt/akraino/validation/ui/db-scripts/EcompSdkDMLMySql_2_4_OS.sql /docker-entrypoint-initdb.d
+COPY --from=0 /opt/akraino/validation/ui/db-scripts/akraino-blueprint_validation_db.sql /docker-entrypoint-initdb.d

diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index 3f5c98a..7b54e71 100644 (file)
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -15,8 +15,8 @@
 #
 
 FROM maven:3.6.1-jdk-11 as build
-RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation/repo
-RUN cd /opt/akraino/validation/repo/ui && mvn clean package
+RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
+RUN cd /opt/akraino/validation/ui && mvn clean package
 
 FROM tomcat:8.5.37
-COPY  --from=build /opt/akraino/validation/repo/ui/target/AECBlueprintValidationUI.war /usr/local/tomcat/webapps
+COPY  --from=build /opt/akraino/validation/ui/target/AECBlueprintValidationUI.war /usr/local/tomcat/webapps