Skip to content

Commit 58fa7cd

Browse files
authored
chore(ci): remove hdfs from docker image (#17786)
1 parent da9c843 commit 58fa7cd

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
cp ./target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/databend-* ./target/${{ env.BUILD_PROFILE }}/
147147
bash ./scripts/ci/ci-run-sqllogic-tests.sh base
148148
149-
build_full:
149+
build_docker:
150150
runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws]
151151
needs: create_release
152152
strategy:
@@ -170,8 +170,8 @@ jobs:
170170
sha: ${{ github.sha }}
171171
target: ${{ matrix.target }}
172172
artifacts: sqllogictests,sqlsmith,metactl,meta,query,bendsave
173-
features: python-udf,storage-hdfs
174-
category: full
173+
features: python-udf
174+
category: docker
175175

176176
publish:
177177
runs-on: [self-hosted, X64, Linux, 2c8g, aws]
@@ -329,7 +329,7 @@ jobs:
329329

330330
docker_service:
331331
runs-on: [self-hosted, X64, Linux, 2c8g, aws]
332-
needs: [create_release, build_full]
332+
needs: [create_release, build_docker]
333333
strategy:
334334
fail-fast: false
335335
matrix:
@@ -346,15 +346,15 @@ jobs:
346346
with:
347347
sha: ${{ github.sha }}
348348
target: x86_64-unknown-linux-gnu
349-
category: full
349+
category: docker
350350
artifacts: ${{ matrix.service }},metactl
351351
path: distro/linux/amd64
352352
- name: Download artifacts for aarch64
353353
uses: ./.github/actions/artifact_download
354354
with:
355355
sha: ${{ github.sha }}
356356
target: aarch64-unknown-linux-gnu
357-
category: full
357+
category: docker
358358
artifacts: ${{ matrix.service }},metactl
359359
path: distro/linux/arm64
360360
- name: Set up QEMU
@@ -430,7 +430,7 @@ jobs:
430430
needs:
431431
- create_release
432432
- build_default
433-
- build_full
433+
- build_docker
434434
- publish
435435
- docker_all_in_one
436436
- docker_service

docker/service/query.Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ ARG TARGETPLATFORM
44
ENV TERM=dumb
55
ENV DEBIAN_FRONTEND=noninteractive
66
RUN apt-get update -y && \
7-
apt-get install -y apt-transport-https ca-certificates gdb curl default-jre-headless && \
7+
apt-get install -y apt-transport-https ca-certificates gdb curl && \
88
apt-get clean && \
99
rm -rf /var/lib/apt/lists/* && \
1010
rm -rf /var/cache/apt/*
11-
ENV JAVA_HOME=/usr/lib/jvm/default-java
12-
ENV HADOOP_HOME=/opt/hadoop
13-
ENV LD_LIBRARY_PATH=${JAVA_HOME}/lib/server:${HADOOP_HOME}/lib/native
14-
ENV CLASSPATH=${HADOOP_HOME}/etc/hadoop:${HADOOP_HOME}/share/hadoop/common/lib/*:${HADOOP_HOME}/share/hadoop/common/*:${HADOOP_HOME}/share/hadoop/hdfs:${HADOOP_HOME}/share/hadoop/hdfs/lib/*:${HADOOP_HOME}/share/hadoop/hdfs/*:${HADOOP_HOME}/share/hadoop/mapreduce/*:${HADOOP_HOME}/share/hadoop/yarn:${HADOOP_HOME}/share/hadoop/yarn/lib/*:${HADOOP_HOME}/share/hadoop/yarn/*
1511
COPY ./distro/$TARGETPLATFORM/databend-query /databend-query
1612
RUN useradd --uid 1000 --shell /sbin/nologin \
1713
--home-dir /var/lib/databend --user-group \
1814
--comment "Databend cloud data analytics" databend && \
1915
mkdir -p /var/lib/databend && \
2016
chown -R databend:databend /var/lib/databend
21-
VOLUME ["/var/lib/databend", "/opt/hadoop"]
17+
VOLUME ["/var/lib/databend"]
2218
ENTRYPOINT ["/databend-query"]

0 commit comments

Comments
 (0)