Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1295] improvement(CI): separate trino image for CI and users #1305

Merged
merged 8 commits into from
Jan 5, 2024
Merged

[#1295] improvement(CI): separate trino image for CI and users #1305

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4664e7e
separate trino image
yuqi1129 Jan 3, 2024
a4ba0ce
separate trino image again
yuqi1129 Jan 3, 2024
66176b0
Fixed
yuqi1129 Jan 4, 2024
e3e2d6b
Fixed
yuqi1129 Jan 4, 2024
4bebbd7
Merge branch 'main' into issue_1295
jerryshao Jan 5, 2024
71ceb55
Fixed
yuqi1129 Jan 5, 2024
c1a12c8
Merge remote-tracking branch 'me/issue_1295' into issue_1295
yuqi1129 Jan 5, 2024
0eb5ef0
Change cp to mv
yuqi1129 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dev/docker/build-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ fi
cd ${script_dir}/${component_type}
if [[ "${platform_type}" == "all" ]]; then
if [ ${build_latest} -eq 1 ]; then
docker buildx build --no-cache --pull --platform=linux/amd64,linux/arm64 ${build_args} --push --progress plain -f Dockerfile -t ${image_name}:latest -t ${image_name}:${tag_name} .
docker buildx build --build-arg IMAGE_NAME=${image_name} --no-cache --pull --platform=linux/amd64,linux/arm64 ${build_args} --push --progress plain -f Dockerfile -t ${image_name}:latest -t ${image_name}:${tag_name} .
else
docker buildx build --no-cache --pull --platform=linux/amd64,linux/arm64 ${build_args} --push --progress plain -f Dockerfile -t ${image_name}:${tag_name} .
docker buildx build --build-arg IMAGE_NAME=${image_name} --no-cache --pull --platform=linux/amd64,linux/arm64 ${build_args} --push --progress plain -f Dockerfile -t ${image_name}:${tag_name} .
fi
else
if [ ${build_latest} -eq 1 ]; then
docker buildx build --no-cache --pull --platform=${platform_type} ${build_args} --output type=docker --progress plain -f Dockerfile -t ${image_name}:latest -t ${image_name}:${tag_name} .
docker buildx build --build-arg IMAGE_NAME=${image_name} --no-cache --pull --platform=${platform_type} ${build_args} --output type=docker --progress plain -f Dockerfile -t ${image_name}:latest -t ${image_name}:${tag_name} .
else
docker buildx build --no-cache --pull --platform=${platform_type} ${build_args} --output type=docker --progress plain -f Dockerfile -t ${image_name}:${tag_name} .
docker buildx build --build-arg IMAGE_NAME=${image_name} --no-cache --pull --platform=${platform_type} ${build_args} --output type=docker --progress plain -f Dockerfile -t ${image_name}:${tag_name} .
fi
fi
11 changes: 9 additions & 2 deletions dev/docker/trino/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,18 @@ RUN rm -rf /usr/lib/trino/plugin/accumulo \
&& rm -rf /usr/lib/trino/plugin/redis \
&& rm -rf /usr/lib/trino/plugin/session-property-managers \
&& rm -rf /usr/lib/trino/plugin/teradata-functions

COPY --chown=trino:trino packages/trino/conf /etc/trino
COPY --chown=trino:trino packages/gravitino-trino-connector/mysql-connector-java-8.0.27.jar /usr/lib/trino/plugin/iceberg/
COPY --chown=trino:trino packages/gravitino-trino-connector/postgresql-42.7.0.jar /usr/lib/trino/plugin/iceberg/
COPY --chown=trino:trino packages/gravitino-trino-connector /usr/lib/trino/plugin/gravitino

ARG IMAGE_NAME
RUN if [ "$IMAGE_NAME" = "datastrato/trino" ] ; then echo "Copying files for ${IMAGE_NAME} image" \
&& COPY --chown=trino:trino packages/gravitino-trino-connector/mysql-connector-java-8.0.27.jar /usr/lib/trino/plugin/gravitino/ \
&& COPY --chown=trino:trino packages/gravitino-trino-connector/postgresql-42.7.0.jar /usr/lib/trino/plugin/gravitino/;\
else echo "Copying files for other images"; \
fi



# Use ARGs to update trino conf and start Trino server
ARG GRAVITINO_HOST_IP
Expand Down