Skip to content

Commit

Permalink
Merge branch 'branch-0.6' into branch-0.6-ci-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
yuqi1129 authored Aug 27, 2024
2 parents 2015386 + 1430ce1 commit 8dc0e08
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
needs: changes
if: needs.changes.outputs.source_changes == 'true'
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 90
strategy:
matrix:
architecture: [linux/amd64]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache/CodeQL
if [[ "${image_type}" == "gravitino" || "{image_type}" == "iceberg-rest-server" ]]; then
if [[ "${image_type}" == "gravitino" || "${image_type}" == "iceberg-rest-server" ]]; then
./dev/docker/build-docker.sh --platform all --type ${image_type} --image ${image_name} --tag ${{ github.event.inputs.version }} --latest
else
./dev/docker/build-docker.sh --platform all --type ${image_type} --image ${image_name} --tag "${tag_name}-${{ github.event.inputs.version }}"
Expand Down
14 changes: 8 additions & 6 deletions dev/docker/trino/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ COPY --chown=trino:trino packages/gravitino-trino-connector/postgresql-42.7.0.ja
RUN mkdir /tmp/gravitino
COPY --chown=trino:trino packages/gravitino-trino-connector /tmp/gravitino

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

RUN case "$TAG_NAME" in \
trino-*) \
mv /tmp/gravitino /usr/lib/trino/plugin/; \
;; \
*) \
echo "Copying files for other images"; \
;; \
esac

# The following ENV are needed to update configuration file before starting Trino server, you need to
# pass these ENV variables to the container when starting it like `docker run --env GRAVITINO_HOST_IP=xxx --env GRAVITINO_HOST_PORT=xxxx`
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -335,5 +335,5 @@ After completing these steps, you should be able to access the Gravitino REST in
This document is just the beginning. You're welcome to customize your Gravitino setup based on your requirements and to explore the vast possibilities this powerful tool offers. If you encounter any issues or have questions, you can always connect with the Gravitino community for assistance.

<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=GettingStarted" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=GettingStarted" style={{ border: 0 }} alt="" />

2 changes: 1 addition & 1 deletion docs/how-to-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,4 @@ Building the Gravitino project compiles the necessary components, and starting t
For instructions on how to run the project using VSCode or IntelliJ on Windows, please refer to [CONTRIBUTING.md](https://github.com/apache/gravitino/blob/main/CONTRIBUTING.md).
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToBuild" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToBuild" style={{ border: 0 }} alt="" />
2 changes: 1 addition & 1 deletion docs/how-to-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@ For the details, review the
[Gravitino playground repository](https://github.com/apache/gravitino-playground) and
[playground example](./how-to-use-the-playground.md).

<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToInstall" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToInstall" style={{ border: 0 }} alt="" />
2 changes: 1 addition & 1 deletion docs/how-to-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ upgraded schema, e.g. if you upgraded the schema to Gravitino 0.8.0 then
you will want to compare your schema dump against the contents of
`schema-0.8.0-<type>.sql`

<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToUpgrade" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowToUpgrade" style={{ border: 0 }} alt="" />
2 changes: 1 addition & 1 deletion docs/how-to-use-the-playground.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,4 @@ select * from catalog_hive.sales.customers
union
select * from catalog_iceberg.sales.customers;
```
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowtoUsePlayground" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=HowtoUsePlayground" style={{ border: 0 }} alt="" />
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ Gravitino provides security configurations for Gravitino, including HTTPS, authe
also lists the change logs of Gravitino CI Docker images and release images.
* [How to upgrade Gravitino](./how-to-upgrade.md): a guide to upgrading the schema of Gravitino storage backend from one release version to another.

<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=Overview" style="border:0;" alt="" />
<img src="https://analytics.apache.org/matomo.php?idsite=62&rec=1&bots=1&action_name=Overview" style={{ border: 0 }} alt="" />

0 comments on commit 8dc0e08

Please sign in to comment.