From cc31414909f7244d389c3e206698285770b33f61 Mon Sep 17 00:00:00 2001
From: suibianwanwan33 <1597226206@qq.com>
Date: Fri, 26 Apr 2024 23:07:32 +0800
Subject: [PATCH] [Hexa] Fix docker run

---
 .github/workflows/docker-image.yml |  6 +++---
 be/Dockerfile                      |  6 +++---
 be/docker.sh                       |  2 +-
 cli/Dockerfile                     |  6 +++---
 cli/docker.sh                      |  2 +-
 fe/Dockerfile                      | 25 ++++++++++++++++++-------
 fe/start.sh                        |  4 ++--
 7 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b270e19..be95c82 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -19,10 +19,10 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_NAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: build and push hexa-fe
-        run: docker build -t suibianwanwan333/hexa-fe:v1.0.0 -f ./fe/Dockerfile ../ && docker push suibianwanwan333/hexa-fe:v1.0.0
+        run: docker build -t suibianwanwan333/hexa-fe:v1.0.0 -f ./fe/Dockerfile . && docker push suibianwanwan333/hexa-fe:v1.0.0
 
       - name: build and push hexa-be
-        run: docker build -t suibianwanwan333/hexa-be:v1.0.0 -f ./be/Dockerfile ../ && docker push suibianwanwan333/hexa-be:v1.0.0
+        run: docker build -t suibianwanwan333/hexa-be:v1.0.0 -f ./be/Dockerfile . && docker push suibianwanwan333/hexa-be:v1.0.0
 
       - name: build and push hexa-cli
-        run: docker build -t suibianwanwan333/hexa-cli:v1.0.0 -f ./cli/Dockerfile ../ && docker push suibianwanwan333/hexa-cli:v1.0.0
\ No newline at end of file
+        run: docker build -t suibianwanwan333/hexa-cli:v1.0.0 -f ./cli/Dockerfile . && docker push suibianwanwan333/hexa-cli:v1.0.0
\ No newline at end of file
diff --git a/be/Dockerfile b/be/Dockerfile
index b620053..8968c75 100644
--- a/be/Dockerfile
+++ b/be/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:1.75-bookworm AS be
 COPY . .
 
 # Copy in source.
-WORKDIR /hexa/be
+WORKDIR /be
 
 RUN chmod +x ./docker.sh
 RUN ./docker.sh
@@ -12,8 +12,8 @@ FROM debian:bookworm-slim
 
 
 # Copy in built stuff.
-COPY --from=be /hexa/be/target/release/hexa-be /
-COPY --from=be /hexa/be/start.sh /
+COPY --from=be /be/target/release/hexa-be /
+COPY --from=be /be/start.sh /
 
 RUN chmod +x ./start.sh
 
diff --git a/be/docker.sh b/be/docker.sh
index 414cdc7..b1bca4d 100644
--- a/be/docker.sh
+++ b/be/docker.sh
@@ -9,6 +9,6 @@ export PATH="$PWD/protoc/bin:$PATH"
 
 protoc --version
 
-cd /hexa/be
+cd be
 
 cargo build --bin hexa-be --release
diff --git a/cli/Dockerfile b/cli/Dockerfile
index d0ad546..be5a1b6 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:1.75-bookworm AS builder
 COPY . .
 
 # Copy in source.
-WORKDIR /hexa/cli
+WORKDIR /cli
 
 
 RUN chmod +x ./docker.sh
@@ -13,8 +13,8 @@ FROM debian:bookworm-slim
 
 
 # Copy in built stuff.
-COPY --from=builder /hexa/cli/target/release/cli /cli
-COPY --from=builder /hexa/cli/start.sh /
+COPY --from=builder /cli/target/release/cli /cli
+COPY --from=builder /cli/start.sh /
 
 RUN chmod +x ./start.sh
 
diff --git a/cli/docker.sh b/cli/docker.sh
index b28b092..0d959d6 100644
--- a/cli/docker.sh
+++ b/cli/docker.sh
@@ -9,6 +9,6 @@ export PATH="$PWD/protoc/bin:$PATH"
 
 protoc --version
 
-cd /hexa/cli
+cd /cli
 
 cargo build --release
diff --git a/fe/Dockerfile b/fe/Dockerfile
index 1c8372e..71716ae 100644
--- a/fe/Dockerfile
+++ b/fe/Dockerfile
@@ -2,7 +2,7 @@ FROM maven:3.6.3-openjdk-8 AS builder
 
 COPY . .
 
-WORKDIR /hexa/fe
+WORKDIR /fe
 
 RUN chmod +x ./package.sh
 RUN ./package.sh
@@ -10,14 +10,25 @@ RUN ./package.sh
 
 FROM openjdk:8-jre-alpine
 
-COPY --from=builder /hexa/fe/main/target/libs/ /hexa-fe/lib/
-COPY --from=builder /hexa/fe/main/target/main-1.0-SNAPSHOT.jar /hexa-fe/lib/
-COPY --from=builder /hexa/fe/main/src/main/resources/ /hexa-fe/etc/
-COPY --from=builder /hexa/fe/start.sh /hexa-fe/bin/
+WORKDIR /fe
+
+COPY --from=builder /fe/main/target/libs/ ./lib/
+COPY --from=builder /fe/main/target/main-1.0-SNAPSHOT.jar ./lib/
+COPY --from=builder /fe/main/src/main/resources/ ./etc/
+COPY --from=builder /fe/start.sh ./bin/
 
 EXPOSE 9065 8082
 
-RUN chmod +x /hexa-fe/bin/start.sh
+
+RUN ls
 RUN pwd
 
-CMD ["/hexa-fe/bin/start.sh"]
\ No newline at end of file
+WORKDIR /fe/bin
+
+RUN ls
+RUN pwd
+
+RUN chmod +x ./start.sh
+
+
+CMD ["./start.sh"]
\ No newline at end of file
diff --git a/fe/start.sh b/fe/start.sh
index 9075751..7350d4c 100644
--- a/fe/start.sh
+++ b/fe/start.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cd /hexa-fe/lib
-java -Dconfig=/hexa-fe/etc/config.properties -cp * com.ccsu.server.Launcher
\ No newline at end of file
+cd /fe/lib
+java -Dconfig=/fe/etc/config.properties -cp * com.ccsu.server.Launcher
\ No newline at end of file