This is an automated email from the ASF dual-hosted git repository.
chunshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb.git
The following commit(s) were added to refs/heads/main by this push:
new 148790c8 fix: docker image use apache namespace (#1529)
148790c8 is described below
commit 148790c8faf75a13988e939313b1c6de2a00bc6e
Author: Jiacai Liu <[email protected]>
AuthorDate: Fri May 10 19:40:28 2024 +0800
fix: docker image use apache namespace (#1529)
## Rationale
After donate ceresdb to ASF, we should publish docker image under
apache.
- https://hub.docker.com/r/apache/horaemeta-server
- https://hub.docker.com/r/apache/horaedb-server
## Detailed Changes
Use `DOCKERHUB_USER ` `DOCKERHUB_TOKEN` to publish image. See details:
https://issues.apache.org/jira/browse/INFRA-25736
## Test Plan
Manually.
-
https://github.com/jiacai2050/incubator-horaedb/actions/runs/9029607730
---------
Co-authored-by: chunshao.rcs <[email protected]>
---
.../{dockerhub-publish.yml => publish-image.yml} | 33 +++++++++++++++++-----
...docker-build-image.yml => test-build-image.yml} | 0
README-CN.md | 3 +-
README.md | 3 +-
horaemeta/Dockerfile | 6 ++--
5 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/dockerhub-publish.yml
b/.github/workflows/publish-image.yml
similarity index 60%
rename from .github/workflows/dockerhub-publish.yml
rename to .github/workflows/publish-image.yml
index 5efd328e..a5a8ec98 100644
--- a/.github/workflows/dockerhub-publish.yml
+++ b/.github/workflows/publish-image.yml
@@ -19,13 +19,13 @@ name: Publish Docker image
on:
workflow_dispatch:
- push:
- tags:
- - 'v*'
+ inputs:
+ version:
+ description: Version to release
+ required: true
jobs:
- docker:
- if: github.repository_owner == 'FIXME'
+ horaemeta:
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -35,11 +35,30 @@ jobs:
- name: Login to DockerHub
uses: docker/login-action@v2
with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
+ username: ${{ secrets.DOCKERHUB_USER }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ - name: Build and Push HoraeMeta Server Docker Image
+ uses: docker/build-push-action@v3
+ with:
+ context: horaemeta
+ push: true
+ tags: apache/horaemeta-server:latest,apache/horaemeta-server:${{
inputs.version }}
+
+ horaedb:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+ - name: Login to DockerHub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push HoraeDB Server Docker Image
uses: docker/build-push-action@v3
with:
context: .
push: true
- tags:
apache/horaemeta-server:latest,horaedb/horaemeta-server:${{github.ref_name}}
+ tags: apache/horaedb-server:latest,apache/horaedb-server:${{
inputs.version }}
diff --git a/.github/workflows/docker-build-image.yml
b/.github/workflows/test-build-image.yml
similarity index 100%
rename from .github/workflows/docker-build-image.yml
rename to .github/workflows/test-build-image.yml
diff --git a/README-CN.md b/README-CN.md
index e5a59a62..20ef6508 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -3,7 +3,8 @@
[](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml)
[](https://github.com/apache/incubator-horaedb/issues)
-<!--
[](https://hub.docker.com/r/apache/horaedb-server)
TODO need to wait for first apache version release. -->
+[](https://hub.docker.com/r/apache/horaedb-server)
+[](https://hub.docker.com/r/apache/horaemeta-server)
[English](./README.md)
diff --git a/README.md b/README.md
index e713e989..92441c1a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
[](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml)
[](https://github.com/apache/incubator-horaedb/issues)
-<!--
[](https://hub.docker.com/r/horaedb/horaedb-server)
TODO need to wait for first apache version release.-->
+[](https://hub.docker.com/r/apache/horaedb-server)
+[](https://hub.docker.com/r/apache/horaemeta-server)
[中文](./README-CN.md)
diff --git a/horaemeta/Dockerfile b/horaemeta/Dockerfile
index 9512582a..6983d744 100644
--- a/horaemeta/Dockerfile
+++ b/horaemeta/Dockerfile
@@ -39,10 +39,10 @@ RUN apt update && \
apt clean
COPY --from=build /horaemeta/bin/horaemeta-server /usr/bin/horaemeta-server
-RUN chmod +x /usr/bin/horaemeta-server
+COPY --from=build /horaemeta/docker/entrypoint.sh /entrypoint.sh
+COPY --from=build /horaemeta/config/example-standalone.toml
/etc/horaemeta/horaemeta.toml
-COPY ./docker/entrypoint.sh /entrypoint.sh
-COPY ./config/example-standalone.toml /etc/horaemeta/horaemeta.toml
+RUN chmod +x /usr/bin/horaemeta-server
ARG TINI_VERSION=v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini
/tini
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
