This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new cdd400f9 fix(ci): remove add tar in github action and modify
lake-builder image (#2105)
cdd400f9 is described below
commit cdd400f907d68c9fef51b95fe2a0abd060364468
Author: Warren Chen <[email protected]>
AuthorDate: Tue Jun 7 16:19:35 2022 +0800
fix(ci): remove add tar in github action and modify lake-builder image
(#2105)
closes #2102
---
.github/workflows/test-e2e.yml | 4 +---
.github/workflows/test.yml | 4 +---
Dockerfile | 3 +--
devops/lake-builder/Dockerfile | 3 ++-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index de5b2f5d..bf4c4d8c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -24,10 +24,8 @@ jobs:
MYSQL_USER: merico
MYSQL_PASSWORD: merico
MYSQL_ROOT_PASSWORD: root
- container: mericodev/lake-builder:0.0.4
+ container: mericodev/lake-builder:0.0.5
steps:
- - run: |
- apk add --no-cache tar
- uses: actions/checkout@v3
- name: Cache test-e2e
id: cache-test-e2e
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a79c7a0d..7fa02e0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,10 +17,8 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
container:
- image: mericodev/lake-builder:0.0.4
+ image: mericodev/lake-builder:0.0.5
steps:
- - run: |
- apk add --no-cache tar
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Golang env
diff --git a/Dockerfile b/Dockerfile
index 6060ac25..36666fb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM mericodev/lake-builder:0.0.4 as builder
+FROM mericodev/lake-builder:0.0.5 as builder
# docker build --build-arg GOPROXY=https://goproxy.io,direct -t mericodev/lake
.
ARG GOPROXY=
@@ -36,7 +36,6 @@ 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
EXPOSE 8080
diff --git a/devops/lake-builder/Dockerfile b/devops/lake-builder/Dockerfile
index 6eed8a2f..f0ad69ec 100644
--- a/devops/lake-builder/Dockerfile
+++ b/devops/lake-builder/Dockerfile
@@ -14,10 +14,11 @@
# limitations under the License.
#
-# current tag: mericodev/lake-builder:0.0.4
+# current tag: mericodev/lake-builder:0.0.5
FROM golang:1.17-alpine3.15 as builder
#RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g'
/etc/apk/repositories
RUN apk update
RUN apk upgrade
#RUN apk add --update gcc=130.2.1_pre1-r3 g++=10.2.1_pre1-r3
RUN apk add --no-cache tzdata libgit2-dev gcc g++ make
+RUN apk add --no-cache tar
\ No newline at end of file