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.

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

[#4072] improvement(docker-image): Transfer docker hub from datastrato to apache #4523

Merged
merged 29 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8160b7f
[#4445] feat(docker): Publish Docker image to Apache official DockerH…
xunliu Aug 8, 2024
730d016
tmp
xunliu Aug 8, 2024
4a27da0
Update docs
xunliu Aug 8, 2024
330d059
Change docker image.
yuqi1129 Aug 14, 2024
ef87a09
test
yuqi1129 Aug 14, 2024
f571c6d
test
yuqi1129 Aug 14, 2024
846d9cc
Fix
yuqi1129 Aug 14, 2024
32e9509
Merge branch 'main' of github.com:datastrato/graviton into issue-4445…
yuqi1129 Aug 14, 2024
63af7d4
Fix
yuqi1129 Aug 14, 2024
6adfa3b
Fix
yuqi1129 Aug 14, 2024
f715e60
Fix
yuqi1129 Aug 15, 2024
d63c68d
Fix
yuqi1129 Aug 15, 2024
d7c926f
Fix
yuqi1129 Aug 15, 2024
5375762
Merge branch 'main' of github.com:datastrato/graviton into issue-4445…
yuqi1129 Aug 15, 2024
54a5a02
Resolve docker naming for Gravitio.
yuqi1129 Aug 15, 2024
cc288c8
Resolve docker naming for Gravitio.
yuqi1129 Aug 15, 2024
9b242e2
Merge branch 'main' of github.com:datastrato/graviton into issue-4445…
yuqi1129 Aug 15, 2024
6a31c1f
Fix
yuqi1129 Aug 15, 2024
4aa1a57
Merge branch 'main' of github.com:datastrato/graviton into issue-4445…
yuqi1129 Aug 16, 2024
fd15a61
Fix comments
yuqi1129 Aug 16, 2024
415df73
Refactor test environment
yuqi1129 Aug 16, 2024
41d2a35
Fix test error.
yuqi1129 Aug 16, 2024
719024b
Fix the version problem.
yuqi1129 Aug 16, 2024
5dd87bc
Change `gravitino-iceberg-rest-server` to `gravitino-iceberg-rest`.
yuqi1129 Aug 16, 2024
6395896
Fix docs in publish-docker-image.jpg
yuqi1129 Aug 16, 2024
53d72bb
Completely replace all docker hub username from `datastrato` to `apache`
yuqi1129 Aug 16, 2024
28de08a
fix
yuqi1129 Aug 17, 2024
0cbcba4
Merge branch 'main' of github.com:datastrato/graviton into issue-4445…
yuqi1129 Aug 19, 2024
acd3da5
fix
yuqi1129 Aug 19, 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: 1 addition & 1 deletion .github/workflows/cron-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

jobs:
changes:
if: github.repository == 'datastrato/gravitino'
if: github.repository == 'apache/gravitino'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cd gravitino

### Development Setup

Once you have cloned the [GitHub repository](https://github.com/apache/gravitino), see [how to build](/docs/how-to-build.md) for instructions on how to build, or you can use the provided docker images at [Datastrato's DockerHub repository](https://hub.docker.com/u/datastrato).
Once you have cloned the [GitHub repository](https://github.com/apache/gravitino), see [how to build](/docs/how-to-build.md) for instructions on how to build, or you can use the provided docker images at [Apache DockerHub repository](https://hub.docker.com/u/apache).

To stop and start a local Gravitino server via `bin/gravitino.sh start` and `bin/gravitino.sh stop` in a Gravitino distribution, see [how to build](/docs/how-to-build.md) for more instructions.

Expand Down
2 changes: 1 addition & 1 deletion dev/docker/trino/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN mkdir /tmp/gravitino
COPY --chown=trino:trino packages/gravitino-trino-connector /tmp/gravitino

ARG IMAGE_NAME
RUN if [ "$IMAGE_NAME" = "datastrato/trino" ] ; then \
RUN if [ "$IMAGE_NAME" = "apache/gravitino-*:trino-*" ] ; then \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@diqiu50
Please help to verify this part.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I this this is better:

apache/gravitino-trino-*:*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After this PR, the name for Trino Docker image will be:

apache/gravitino-ci:trino-xxxx
apache/gravitino-playground:trino-xxxx

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@diqiu50
We will use the tag name to indicate whether it's a Trino image, so please help verify its accuracy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's ok.

mv /tmp/gravitino /usr/lib/trino/plugin/; \
else echo "Copying files for other images"; \
fi
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Installing and configuring Hive can be a little complex. If you don't already ha
Follow these instructions for setting up [Docker on Ubuntu](https://docs.docker.com/engine/install/ubuntu/).

```shell
sudo docker run --name gravitino-container -d -p 9000:9000 -p 8088:8088 -p 50010:50010 -p 50070:50070 -p 50075:50075 -p 10000:10000 -p 10002:10002 -p 8888:8888 -p 9083:9083 -p 8022:22 datastrato/hive:2.7.3-no-yarn
sudo docker run --name gravitino-container -d -p 9000:9000 -p 8088:8088 -p 50010:50010 -p 50070:50070 -p 50075:50075 -p 10000:10000 -p 10002:10002 -p 8888:8888 -p 9083:9083 -p 8022:22 apache/gravitino-playground:hive:2.7.3
```

Once Docker is installed, you can start the container with the command:
Expand Down
4 changes: 2 additions & 2 deletions docs/how-to-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ For more detailed information about the Gravitino Iceberg REST server, please re

### Get the Apache Gravitino Docker image

Gravitino publishes the Docker image to [Docker Hub](https://hub.docker.com/r/datastrato/gravitino/tags).
Gravitino publishes the Docker image to [Docker Hub](https://hub.docker.com/r/apache/gravitino/tags).
Run the Gravitino Docker image by running:

```shell
docker run -d -i -p 8090:8090 datastrato/gravitino:<version>
docker run -d -i -p 8090:8090 apache/gravitino:<version>
```

Access the Gravitino Web UI by typing `http://localhost:8090` in your browser, or you
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Some integration test cases depend on the Gravitino CI Docker image.
If an integration test relies on the specific Gravitino CI Docker image,
set the `@tag(gravitino-docker-test)` annotation in the test class.
For example, the `integration-test/src/test/.../CatalogHiveIT.java` test needs to connect to
the `datastrato/gravitino-ci-hive` Docker container for testing the Hive data source.
the `apache/gravitino-ci:hive-{hive-version}` Docker container for testing the Hive data source.
Therefore, it should have the following `@tag` annotation:`@tag(gravitino-docker-test)`. This annotation
helps identify the specific Docker container required for the integration test.

Expand Down
4 changes: 2 additions & 2 deletions docs/iceberg-rest-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ SELECT * FROM dml.test;
You could run Gravitino Iceberg REST server though docker container:

```shell
docker run -d -p 9001:9001 datastrato/iceberg-rest-server:0.6
docker run -d -p 9001:9001 apache/gravitino-iceberg-rest:0.6.0
```

Or build it manually to add custom logics:

```shell
sh ./dev/docker/build-docker.sh --platform linux/arm64 --type iceberg-rest-server --image datastrato/iceberg-rest-server --tag 0.6
sh ./dev/docker/build-docker.sh --platform linux/arm64 --type iceberg-rest-server --image apache/gravitino-iceberg-rest --tag 0.6.0
```

You could try Spark with Gravitino REST catalog service in our [playground](./how-to-use-the-playground.md#using-iceberg-rest-service).
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ your system `PATH`, or the `JAVA_HOME` environment variable pointing to a Java i

See [How to install Gravitino](./how-to-install.md) to learn how to install the Gravitino server.

Gravitino provides Docker images on [Docker Hub](https://hub.docker.com/u/datastrato).
Gravitino provides Docker images on [Docker Hub](https://hub.docker.com/u/apache).
Pull the image and run it. For details of the Gravitino Docker image, see
[Docker image details](./docker-image-details.md).

Expand Down
12 changes: 6 additions & 6 deletions docs/publish-docker-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ You can use GitHub actions to publish Docker images to the Docker Hub repository
+ Selecting the main branch results in publishing the Docker image with the specified tag and the latest tag.
+ Selecting another branch, results are publishing the Docker image with the specified tag.
4. Choose the image you want to build
+ `datastrato/gravitino-ci:hive`.
+ `datastrato/gravitino-ci:trino`.
+ `apache/gravitino-ci:hive`.
+ `apache/gravitino-ci:trino`.
+ Future plans include support for other data sources.
5. Input the `tag name`, for example: `0.1.0`, Then build and push the Docker image name. Currently, the Docker image name is in the format:
1. `datastrato/gravitino-ci:{image-type}-0.1.0` if this is a trino CI image, image-type is `trino`, `hive`, `kerberos-hive`, `doris`, `ranger`.
2. `datastrato/gravitino-playground:{image-type}-0.1.0` if this is a playground image, image-type is `trino`, `hive`, `ranger`.
3. `datastrato/gravitino:0.1.0` if this is a gravitino server image.
4. `datastrato/gravitino-iceberg-rest:0.1.0` if this is an iceberg-rest server image.
1. `apache/gravitino-ci:{image-type}-0.1.0` if this is a trino CI image, image-type is `trino`, `hive`, `kerberos-hive`, `doris`, `ranger`.
2. `apache/gravitino-playground:{image-type}-0.1.0` if this is a playground image, image-type is `trino`, `hive`, `ranger`.
3. `apache/gravitino:0.1.0` if this is a gravitino server image.
4. `apache/gravitino-iceberg-rest:0.1.0` if this is an iceberg-rest server image.
6. You must enter the correct `docker user name`and `publish docker token` before you can execute run `Publish Docker Image` workflow.
7. Wait for the workflow to complete. You can see a new Docker image shown in the [Apache Docker Hub](https://hub.docker.com/u/apache) repository.

Expand Down
Loading