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 #1344

Merged
merged 2 commits into from
Jan 5, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e7333
[#1295] improvement(CI): separate trino image for CI and users (#1305)
yuqi1129 Jan 5, 2024
5944beb
Merge branch 'branch-0.3' into cherry-pick-branch-0.3-89955d326fff033…
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
2 changes: 2 additions & 0 deletions dev/docker/build-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ else
exit 1
fi

build_args="${build_args} --build-arg IMAGE_NAME=${image_name}"

# Create multi-arch builder
BUILDER_NAME="gravitino-builder"
builders=$(docker buildx ls)
Expand Down
13 changes: 11 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,20 @@ 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

RUN mkdir /tmp/gravitino
COPY --chown=trino:trino packages/gravitino-trino-connector /tmp/gravitino

ARG IMAGE_NAME
RUN if [ "$IMAGE_NAME" = "datastrato/trino" ] ; then \
mv /tmp/gravitino /usr/lib/trino/plugin/; \
else echo "Copying files for other images"; \
fi



# Use ARGs to update trino conf and start Trino server
ARG GRAVITINO_HOST_IP
Expand Down
3 changes: 3 additions & 0 deletions docs/docker-image-details.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ You can use this image to test Trino.

Changelog

- gravitino-ci-trino:0.1.3
- Remove copy content in folder `gravitino-trino-connector` to plugin folder `/usr/lib/trino/plugin/gravitino`

- gravitino-ci-trino:0.1.2
- Copy JDBC driver 'mysql-connector-java' and 'postgres' to `/usr/lib/trino/iceberg/` folder

Expand Down