D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

that work

pull/23/head
ljaqueme 2019-06-11 13:49:56 -06:00
parent 6b5ec52e28
commit c6f21f0b5f
2 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/Dockerfile.d4-server
View File

@ -1,29 +1,34 @@
FROM python:3 FROM python:3
WORKDIR /usr/src/d4-server
#RUN git clone https://github.com/D4-project/d4-core.git # that doesn't work on windows docker due to linefeeds
RUN git clone https://github.com/trolldbois/d4-core.git # WORKDIR /usr/src/d4-server
RUN mv d4-core
# that doesn't work on windows due to linefeeds
# COPY . . # COPY . .
## alternate solution
# RUN git clone https://github.com/D4-project/d4-core.git
WORKDIR /usr/src/tmp
RUN git clone https://github.com/trolldbois/d4-core.git
RUN mv d4-core/server/ /usr/src/d4-server
WORKDIR /usr/src/d4-server
ENV D4_HOME=/usr/src/d4-server ENV D4_HOME=/usr/src/d4-server
RUN pip install --no-cache-dir -r requirement.txt RUN pip install --no-cache-dir -r requirement.txt
# move to tls proxy ? # move to tls proxy ?
#WORKDIR /usr/src/d4-server/gen_cert WORKDIR /usr/src/d4-server/gen_cert
#RUN ./gen_root.sh RUN ./gen_root.sh
#RUN ./gen_cert.sh RUN ./gen_cert.sh
# setup a lots of files # setup a lots of files
#WORKDIR /usr/src/d4-server/web WORKDIR /usr/src/d4-server/web
#RUN ./update_web.sh RUN ./update_web.sh
WORKDIR /usr/src/d4-server
#WORKDIR /usr/src/d4-server # configure
RUN cp configs/server.conf.sample configs/server.conf
#ENTRYPOINT ["python", "server.py", "-v", "10"] ENTRYPOINT ["python", "server.py", "-v", "10"]
CMD bash -l # CMD bash -l

55
server/docker-compose.yml
View File

@ -2,26 +2,63 @@ version: "3"
services: services:
redis-stream: redis-stream:
image: redis image: redis
expose: entrypoint:
- 6379 - redis-server
- --port 6379
redis-metadata: redis-metadata:
image: redis image: redis
expose: entrypoint:
- 6380 - redis-server
web: - --port 6380
d4-server:
build: build:
context: . context: .
dockerfile: Dockerfile.d4-server dockerfile: Dockerfile.d4-server
image: d4-server:latest image: d4-server:latest
#build: ./Dockerfile.d4-server
depends_on: depends_on:
- redis-stream - redis-stream
- redis-metadata - redis-metadata
environment: environment:
- D4_REDIS_STREAM_HOST=redis - D4_REDIS_STREAM_HOST=redis-stream
- D4_REDIS_STREAM_PORT=6379 - D4_REDIS_STREAM_PORT=6379
- D4_REDIS_METADATA_HOST=redis - D4_REDIS_METADATA_HOST=redis-metadata
- D4_REDIS_METADATA_PORT=6380 - D4_REDIS_METADATA_PORT=6380
ports: ports:
- "80:80" - "4443:4443"
# d4-worker_1:
# build:
# context: .
# dockerfile: Dockerfile.d4-server
# image: d4-server:latest
# depends_on:
# - redis-stream
# - redis-metadata
# environment:
# - D4_REDIS_STREAM_HOST=redis-stream
# - D4_REDIS_STREAM_PORT=6379
# - D4_REDIS_METADATA_HOST=redis-metadata
# - D4_REDIS_METADATA_PORT=6380
# entrypoint:
# - bash
# - -c
# - "cd workers/workers_1; ./workers_manager.py; read x"
d4-web:
build:
context: .
dockerfile: Dockerfile.d4-server
image: d4-server:latest
depends_on:
- redis-stream
- redis-metadata
environment:
- D4_REDIS_STREAM_HOST=redis-stream
- D4_REDIS_STREAM_PORT=6379
- D4_REDIS_METADATA_HOST=redis-metadata
- D4_REDIS_METADATA_PORT=6380
entrypoint:
- bash
- -c
- "cd web; ./Flask_server.py; read x"
ports:
- "8080:7000"