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 5efd328efa..a5a8ec98fd 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 e5a59a6268..20ef650895 100644 --- a/README-CN.md +++ b/README-CN.md @@ -3,7 +3,8 @@ ![License](https://img.shields.io/badge/license-Apache--2.0-green.svg) [![CI](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml/badge.svg)](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml) [![OpenIssue](https://img.shields.io/github/issues/apache/incubator-horaedb)](https://github.com/apache/incubator-horaedb/issues) - +[![HoraeDB Docker](https://img.shields.io/docker/v/apache/horaedb-server?logo=docker&label=horaedb-server)](https://hub.docker.com/r/apache/horaedb-server) +[![HoraeMeta Docker](https://img.shields.io/docker/v/apache/horaemeta-server?logo=docker&label=horaemeta-server)](https://hub.docker.com/r/apache/horaemeta-server) [English](./README.md) diff --git a/README.md b/README.md index e713e989a6..92441c1a51 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ ![License](https://img.shields.io/badge/license-Apache--2.0-green.svg) [![CI](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml/badge.svg)](https://github.com/apache/incubator-horaedb/actions/workflows/ci.yml) [![OpenIssue](https://img.shields.io/github/issues/apache/incubator-horaedb)](https://github.com/apache/incubator-horaedb/issues) - +[![HoraeDB Docker](https://img.shields.io/docker/v/apache/horaedb-server?logo=docker&label=horaedb-server)](https://hub.docker.com/r/apache/horaedb-server) +[![HoraeMeta Docker](https://img.shields.io/docker/v/apache/horaemeta-server?logo=docker&label=horaemeta-server)](https://hub.docker.com/r/apache/horaemeta-server) [中文](./README-CN.md) diff --git a/horaemeta/Dockerfile b/horaemeta/Dockerfile index 9512582af7..6983d744af 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