Merge branch 'fix-dockerhub'

jiacai2050 · May 10, 2024 · 2fc57bf · 2fc57bf
2 parents 6d39115 + 08af50f
commit 2fc57bf
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/.github/workflows/dockerhub-publish.yml → .github/workflows/publish-image.yml b/.github/workflows/dockerhub-publish.yml → .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,31 @@ 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 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}}
+          file: horaemeta/Dockerfile
+          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/horaedb-server:latest,apache/horaedb-server:${{ inputs.version }}
diff --git a/.github/workflows/docker-build-image.yml → .github/workflows/test-build-image.yml b/.github/workflows/docker-build-image.yml → .github/workflows/test-build-image.yml
diff --git 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)
-<!-- [![Docker](https://img.shields.io/docker/v/horaedb/horaedb-server?logo=docker)](https://hub.docker.com/r/horaedb/horaedb-server) TODO need to wait for first apache version release.-->
+[![HoraeDB Docker](https://img.shields.io/docker/v/apache/horaedb-server?logo=docker)](https://hub.docker.com/r/apache/horaedb-server)
+[![HoraeMeta Docker](https://img.shields.io/docker/v/apache/horaemeta-server?logo=docker)](https://hub.docker.com/r/apache/horaemeta-server)
 
 [中文](./README-CN.md)
 

diff --git a/horaemeta/Dockerfile b/horaemeta/Dockerfile
@@ -24,7 +24,7 @@ USER root
 
 RUN apt update && apt install --yes gcc g++ libssl-dev pkg-config cmake && rm -rf /var/lib/apt/lists/*
 
-COPY . /horaemeta
+COPY horaemeta /horaemeta
 WORKDIR /horaemeta
 
 RUN make build