From 088e841f4b5e1aba5469720033072e36c9679419 Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Wed, 3 Jul 2019 11:53:39 +0300 Subject: [PATCH] [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 Change-Id: I3bf262ea565e487f635b398d0f49314eceb5162e --- docker/mariadb/Dockerfile | 15 ++++++++------- docker/ui/Dockerfile | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile index 7d109bc..a2a1b19 100644 --- 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 --- 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 -- 2.16.6