[incubator-devlake] 04/06: fix: resolve conflit

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch release-v0.11
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 55512d6ba9e2597b2938df73e955a3ba92f6979e
Author: zhangliang <li...@merico.dev>
AuthorDate: Wed Jun 8 19:15:28 2022 +0800

    fix: resolve conflit
---
 Dockerfile           | 23 ++++++++++++-----------
 config-ui/Dockerfile | 25 +++++++++++++++++++++++++
 grafana/Dockerfile   | 25 +++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6060ac25..7600f01b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM mericodev/lake-builder:0.0.4 as builder
+#Apache DevLake is an effort undergoing incubation at The Apache Software
+#Foundation (ASF), sponsored by the Apache Incubator PMC.
+#
+#Incubation is required of all newly accepted projects until a further review
+#indicates that the infrastructure, communications, and decision making process
+#have stabilized in a manner consistent with other successful ASF projects.
+#
+#While incubation status is not necessarily a reflection of the completeness or stability of the code,
+#it does indicate that the project has yet to be fully endorsed by the ASF.
+
+FROM mericodev/lake-builder:0.0.5 as builder
 
 # docker build --build-arg GOPROXY=https://goproxy.io,direct -t mericodev/lake .
 ARG GOPROXY=
@@ -27,16 +37,7 @@ ENV GOBIN=/app/bin
 
 RUN make clean && make all
 
-FROM --platform=linux/amd64 alpine:3.15
-RUN apk add --no-cache musl-dev libgit2-dev libffi-dev \
-    && apk add --no-cache gcc
-
-ENV PYTHONUNBUFFERED=1
-RUN apk add --update --no-cache python3-dev && ln -sf python3 /usr/bin/python
-RUN python3 -m ensurepip
-RUN pip3 install --no-cache --upgrade pip setuptools
-RUN pip3 install dbt-mysql
-RUN apk add --no-cache tar
+FROM --platform=linux/amd64 mericodev/alpine-dbt-mysql:0.0.1
 
 EXPOSE 8080
 
diff --git a/config-ui/Dockerfile b/config-ui/Dockerfile
index 7e73016b..eccd50f4 100644
--- a/config-ui/Dockerfile
+++ b/config-ui/Dockerfile
@@ -1,3 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#Apache DevLake is an effort undergoing incubation at The Apache Software
+#Foundation (ASF), sponsored by the Apache Incubator PMC.
+#
+#Incubation is required of all newly accepted projects until a further review
+#indicates that the infrastructure, communications, and decision making process
+#have stabilized in a manner consistent with other successful ASF projects.
+#
+#While incubation status is not necessarily a reflection of the completeness or stability of the code,
+#it does indicate that the project has yet to be fully endorsed by the ASF.
+
 FROM node:16 as builder
 WORKDIR /home/node/code
 COPY package.json /home/node/code
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 9b37197b..096821e0 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,3 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#Apache DevLake is an effort undergoing incubation at The Apache Software
+#Foundation (ASF), sponsored by the Apache Incubator PMC.
+#
+#Incubation is required of all newly accepted projects until a further review
+#indicates that the infrastructure, communications, and decision making process
+#have stabilized in a manner consistent with other successful ASF projects.
+#
+#While incubation status is not necessarily a reflection of the completeness or stability of the code,
+#it does indicate that the project has yet to be fully endorsed by the ASF.
+
 FROM grafana/grafana:8.0.6
 COPY ./provisioning/dashboards /etc/grafana/provisioning/dashboards
 COPY ./provisioning/datasources /etc/grafana/provisioning/datasources