Fix ci pipeline

kysre · Feb 3, 2024 · 282bb43 · 282bb43
1 parent 2cc1a9a
commit 282bb43
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -25,11 +25,12 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: .
+          file: ./leader/Dockerfile
           push: true
-          target: leader
           tags: kysre/turtlemq:leader-latest
 
-  data-node:
+  datanode:
     runs-on: ubuntu-latest
     steps:
       -
@@ -48,6 +49,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: .
+          file: ./datanode/Dockerfile
           push: true
-          target: data-node
-          tags: kysre/turtlemq:datanode-latest
+          tags: kysre/turtlemq:datanode-latest
diff --git a/.github/workflows/dev.build.yaml b/.github/workflows/dev.build.yaml
@@ -10,6 +10,11 @@ jobs:
   leader:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -26,13 +31,19 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: ./leader
+          file: ./leader/Dockerfile
           push: true
-          target: leader
           tags: kysre/turtlemq:leader-${{ steps.extract_branch.outputs.branch }}
 
-  data-node:
+  datanode:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -49,6 +60,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: ./datanode
+          file: ./datanode/Dockerfile
           push: true
-          target: data-node
-          tags: kysre/turtlemq:datanode-${{ steps.extract_branch.outputs.branch }}
+          tags: kysre/turtlemq:datanode-${{ steps.extract_branch.outputs.branch }}
diff --git a/datanode/Dockerfile b/datanode/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.10-slim
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
+
+COPY ./src ./src
+
+EXPOSE 1234
diff --git a/Dockerfile → leader/Dockerfile b/Dockerfile → leader/Dockerfile
@@ -1,30 +1,19 @@
-FROM python:3.10-slim AS data-node
-
-WORKDIR /usr/src/app
-
-COPY datanode/requirements.txt ./
-RUN pip install -r requirements.txt
-
-COPY ./datanode/src ./src
-
-EXPOSE 1234
-
-FROM golang:1.21-bookworm AS leader-build
+FROM golang:1.21-bookworm AS build
 WORKDIR /srv/build
 
 ARG no_proxy
 ARG NO_PROXY
 
 RUN apt update --fix-missing
 
-ADD Makefile leader/go.mod leader/go.sum ./
+ADD Makefile go.mod go.sum ./
 RUN go mod download
 
-COPY ./leader .
+COPY . .
 RUN go build -o $@ leader ./cmd/$@
 
 
-FROM debian:bookworm as leader
+FROM debian:bookworm as final
 
 RUN apt update --fix-missing && \
     apt-get upgrade -y && \
@@ -39,9 +28,9 @@ RUN apt install -y nano vim
 
 WORKDIR /srv/build
 
-COPY --from=leader-build /srv/build/. /srv/build
+COPY --from=build /srv/build/. /srv/build
 
-COPY --from=leader-build /srv/build/leader /bin/
+COPY --from=build /srv/build/leader /bin/
 
 RUN echo $(ls /bin)