diff --git a/docker/Dockerfile b/docker/Dockerfile index 6f3ce35..cd5dd99 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,9 +16,6 @@ COPY requirements.txt /code/ COPY discord-patched.tgz /code/ RUN python -m venv /venv -RUN ls -RUN ls /venv -RUN . /venv/bin/activate && ls RUN . /venv/bin/activate && pip install -r requirements.txt # && python -m spacy download en_core_web_sm diff --git a/docker/build.tar b/docker/build.tar new file mode 100644 index 0000000..16a77ac Binary files /dev/null and b/docker/build.tar differ diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index ed792f2..ef5ada1 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -17,9 +17,9 @@ services: threshold: image: pathogen/threshold:latest container_name: threshold - build: ./legacy/docker + build: ../legacy/docker volumes: - - ${PORTAINER_GIT_DIR}:/code + - ..:/code - ${THRESHOLD_CONFIG_DIR}:/code/legacy/conf/live #- ${THRESHOLD_TEMPLATE_DIR}:/code/conf/templates - ${THRESHOLD_CERT_DIR}:/code/legacy/conf/cert @@ -64,7 +64,7 @@ services: soft: 65535 hard: 65535 volumes: - - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf + - ./redis.conf:/etc/redis.conf - redis_data:/data volumes_from: - tmp diff --git a/docker/requirements.txt b/docker/requirements.txt index 3f702c3..2cc570f 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -20,5 +20,4 @@ gensim python-Levenshtein orjson uvloop -numba elasticsearch[async] diff --git a/legacy/docker-compose.yml b/legacy/docker-compose.yml deleted file mode 100644 index 28d0c60..0000000 --- a/legacy/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: "2" - -services: - app: - image: pathogen/threshold:latest - build: ./docker - volumes: - - ${PORTAINER_GIT_DIR}:/code - - ${THRESHOLD_CONFIG_DIR}:/code/conf/live - #- ${THRESHOLD_TEMPLATE_DIR}:/code/conf/templates - - ${THRESHOLD_CERT_DIR}:/code/conf/cert - ports: - - "${THRESHOLD_LISTENER_PORT}:${THRESHOLD_LISTENER_PORT}" - - "${THRESHOLD_RELAY_PORT}:${THRESHOLD_RELAY_PORT}" - - "${THRESHOLD_API_PORT}:${THRESHOLD_API_PORT}" - env_file: - - .env - # for development - extra_hosts: - - "host.docker.internal:host-gateway" - volumes_from: - - tmp - - tmp: - image: busybox - command: chmod -R 777 /var/run/redis - volumes: - - /var/run/redis - - redis: - image: redis - command: redis-server /etc/redis.conf - volumes: - - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf - volumes_from: - - tmp - -networks: - default: - external: - name: pathogen \ No newline at end of file diff --git a/legacy/requirements.txt b/legacy/requirements.txt deleted file mode 100644 index 305fe7d..0000000 --- a/legacy/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -wheel -pre-commit -twisted -pyOpenSSL -redis -pyYaML -service_identity -siphashc -Klein diff --git a/requirements.txt b/requirements.txt index 398d175..866bafa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,5 +21,4 @@ gensim python-Levenshtein orjson uvloop -numba elasticsearch[async]