From b39b0039219c437d6222f0c8a42bec7c6fe77189 Mon Sep 17 00:00:00 2001
From: sendssf <2336526392@qq.com>
Date: Sun, 23 Apr 2023 22:22:51 +0800
Subject: [PATCH] Chore: Change dockerfile

---
 .github/workflows/docker.yml         |  9 +++++----
 dependency/Dockerfile/Dockerfile_cpp |  7 ++++---
 dependency/Dockerfile/Dockerfile_run |  8 +++++---
 dependency/shell/cpp_output.sh       |  8 ++++++++
 dependency/shell/generate_proto.sh   | 10 ++++++++++
 5 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 dependency/shell/cpp_output.sh
 create mode 100644 dependency/shell/generate_proto.sh

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 184e5ec..58409d3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -10,10 +10,11 @@ jobs:
     - uses: actions/checkout@v3
     - name: Log in to DockerHub
       run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-    - name: Build base docker image
-      run: docker build -t ${{ secrets.DOCKER_USERNAME }}/thuai6_base:base -f ./dependency/Dockerfile/Dockerfile_base .
-    - name: Push base image to DockerHub
-      run: docker push ${{ secrets.DOCKER_USERNAME }}/thuai6_base:base
+
+    #- name: Build base docker image
+    #  run: docker build -t ${{ secrets.DOCKER_USERNAME }}/thuai6_base:base -f ./dependency/Dockerfile/Dockerfile_base .
+    #- name: Push base image to DockerHub
+    #  run: docker push ${{ secrets.DOCKER_USERNAME }}/thuai6_base:base
 
 
     - name: Build cpp_compile docker image
diff --git a/dependency/Dockerfile/Dockerfile_cpp b/dependency/Dockerfile/Dockerfile_cpp
index 443615d..99e17cb 100644
--- a/dependency/Dockerfile/Dockerfile_cpp
+++ b/dependency/Dockerfile/Dockerfile_cpp
@@ -1,12 +1,13 @@
 #FROM ubuntu:18.04
-FROM wangsk21/thuai6:base
-MAINTAINER eesast.com
+FROM eesast/thuai6_base:base
+MAINTAINER eesast
 WORKDIR /usr/local
 
 COPY ./CAPI/cpp /usr/local/PlayerCode/CAPI/cpp
 COPY ./dependency/proto /usr/local/PlayerCode/dependency/proto
+COPY ./dependency/shell /usr/local/PlayerCode/dependency/shell
 WORKDIR /usr/local/PlayerCode/dependency/proto
-RUN ./cpp_output.sh
+RUN ../shell/cpp_output.sh
 WORKDIR /usr/local/PlayerCode/CAPI/cpp
 COPY ./dependency/shell/compile.sh .
 COPY ./dependency/shell/docker.sh /usr/local/
diff --git a/dependency/Dockerfile/Dockerfile_run b/dependency/Dockerfile/Dockerfile_run
index 5429f55..9339441 100644
--- a/dependency/Dockerfile/Dockerfile_run
+++ b/dependency/Dockerfile/Dockerfile_run
@@ -1,14 +1,16 @@
-FROM wangsk21/thuai6:base
+FROM eesast/thuai6_base:base
+MAINTAINER eesast
 WORKDIR /usr/local
 RUN mkdir /usr/local/team1 && mkdir /usr/local/team2 && mkdir /usr/local/playback
 COPY ./dependency/shell/run.sh .
 #COPY ./dependency/shell/runcpp.sh .
-COPY ./dependency/shell/docker.sh .
+COPY ./dependency/shell/docker.sh .  
 
 COPY ./CAPI/python /usr/local/PlayerCode/CAPI/python
 COPY ./dependency/proto /usr/local/PlayerCode/dependency/proto
+COPY ./dependency/shell /usr/local/PlayerCode/dependency/shell
 WORKDIR /usr/local/PlayerCode/CAPI/python
-RUN ./generate_proto.sh
+RUN ../../dependency/shell/generate_proto.sh
 
 WORKDIR /usr/local
 RUN wget -P . https://cloud.tsinghua.edu.cn/f/e48940314a6d4cdb8bd0/?dl=1
diff --git a/dependency/shell/cpp_output.sh b/dependency/shell/cpp_output.sh
new file mode 100644
index 0000000..a8b0797
--- /dev/null
+++ b/dependency/shell/cpp_output.sh
@@ -0,0 +1,8 @@
+protoc Message2Clients.proto --cpp_out=.
+protoc MessageType.proto --cpp_out=.
+protoc Message2Server.proto --cpp_out=.
+protoc Services.proto --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_cpp_plugin`
+protoc Services.proto --cpp_out=.
+chmod -R 755 ./
+mv -f ./*.h ../../CAPI/cpp/proto
+mv -f ./*.cc ../../CAPI/cpp/proto
diff --git a/dependency/shell/generate_proto.sh b/dependency/shell/generate_proto.sh
new file mode 100644
index 0000000..a0ebe22
--- /dev/null
+++ b/dependency/shell/generate_proto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+python -m pip install -r requirements.txt
+
+mkdir -p proto
+
+python -m grpc_tools.protoc -I../../dependency/proto/ --python_out=./proto --pyi_out=./proto MessageType.proto
+python -m grpc_tools.protoc -I../../dependency/proto/ --python_out=./proto --pyi_out=./proto Message2Clients.proto
+python -m grpc_tools.protoc -I../../dependency/proto/ --python_out=./proto --pyi_out=./proto Message2Server.proto
+python -m grpc_tools.protoc -I../../dependency/proto/ --python_out=./proto --pyi_out=./proto --grpc_python_out=./proto Services.proto