fix meta

apache · May 10, 2024 · a3940ad · a3940ad
1 parent 6baf6df
commit a3940ad
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/dockerhub-publish.yml b/.github/workflows/dockerhub-publish.yml
@@ -24,8 +24,8 @@ on:
       - 'v*'
 
 jobs:
-  docker:
-    if: github.repository_owner == 'FIXME'
+  horaemeta:
+    if: github.repository_owner == 'apache'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -35,11 +35,32 @@ 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:${{github.ref_name}}
+
+  horaedb:
+    if: github.repository_owner == 'apache'
+    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:${{github.ref_name}}
diff --git a/.github/workflows/publish-nightly-image.yml b/.github/workflows/publish-nightly-image.yml
@@ -29,7 +29,7 @@ env:
 
 jobs:
   docker:
-    # if: github.repository_owner == 'apache'
+    if: github.repository_owner == 'apache'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -43,7 +43,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
-          username: jiacailiu
+          username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set Environment Variables
         run: |

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