refactor: support python-core 2.0

cloudforet-io · Nov 17, 2023 · 934d6d4 · 934d6d4
1 parent 7afe0bc
commit 934d6d4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM cloudforet/python-core:2.0
 
 ENV PYTHONUNBUFFERED 1
 ENV SPACEONE_PORT 50051
@@ -13,15 +13,11 @@ COPY pkg/*.txt ${PKG_DIR}/
 RUN pip install --upgrade pip && \
     pip install --upgrade -r ${PKG_DIR}/pip_requirements.txt
 
-ARG CACHEBUST=1
-RUN pip install --upgrade --pre spaceone-core spaceone-api
-
 COPY src ${SRC_DIR}
 WORKDIR ${SRC_DIR}
-RUN python3 setup.py install && \
-    rm -rf /tmp/*
+RUN python3 setup.py install && rm -rf /tmp/*
 
 EXPOSE ${SPACEONE_PORT}
 
 ENTRYPOINT ["spaceone"]
-CMD ["grpc", "cloudforet.plugin"]
+CMD ["run", "grpc-server", "cloudforet.plugin"]
diff --git a/src/cloudforet/plugin/conf/proto_conf.py b/src/cloudforet/plugin/conf/proto_conf.py
diff --git a/src/cloudforet/plugin/interface/grpc/__init__.py b/src/cloudforet/plugin/interface/grpc/__init__.py
@@ -0,0 +1,7 @@
+from spaceone.core.pygrpc.server import GRPCServer
+from .collector import Collector
+
+_all_ = ['app']
+
+app = GRPCServer()
+app.add_service(Collector)