Skip to content

Commit 36c2560

Browse files
authored
Merge pull request #5 from stat-kwon/master
Change build files
2 parents 554c884 + 89e5e9f commit 36c2560

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM python:3.8-slim
1+
FROM cloudforet/python-core:1
22

33
ENV PYTHONUNBUFFERED 1
4-
ENV SPACEONE_PORT 50051
4+
ENV CLOUDONE_PORT 50051
55
ENV SERVER_TYPE grpc
66
ENV PKG_DIR /tmp/pkg
77
ENV SRC_DIR /tmp/src
@@ -10,16 +10,16 @@ RUN apt update && apt upgrade -y
1010

1111
COPY pkg/*.txt ${PKG_DIR}/
1212
RUN pip install --upgrade pip && \
13-
pip install --upgrade -r ${PKG_DIR}/pip_requirements.txt && \
14-
pip install --upgrade --pre spaceone-core spaceone-api
13+
pip install --upgrade --use-deprecated=legacy-resolver -r ${PKG_DIR}/pip_requirements.txt && \
14+
pip install --upgrade spaceone-api
1515

1616
COPY src ${SRC_DIR}
17-
ARG CACHEBUST=1
17+
1818
WORKDIR ${SRC_DIR}
1919
RUN python3 setup.py install && \
2020
rm -rf /tmp/*
2121

22-
EXPOSE ${SPACEONE_PORT}
22+
EXPOSE ${CLOUDONE_PORT}
2323

2424
ENTRYPOINT ["spaceone"]
2525
CMD ["grpc", "spaceone.monitoring"]

pkg/pip_requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
spaceone-core
2-
spaceone-api
3-
spaceone-tester
41
google-auth
52
google-api-python-client
63
schematics

src/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
license='Apache License 2.0',
3232
packages=find_packages(),
3333
install_requires=[
34-
'spaceone-core',
3534
'spaceone-api',
3635
'google-auth',
3736
'google-api-python-client',

0 commit comments

Comments
 (0)