Undo Podman changes

2023-07-29 16:28:12 +00:00 · 2023-07-29 16:28:12 +00:00 · 9474a516ac
parent 8ef39ffe48
commit 9474a516ac
7 changed files with 78 additions and 82 deletions
--- a/6
+++ b/6
@ -2,8 +2,8 @@
 FROM python:3
 ARG OPERATION

-RUN mkdir -p /code
 RUN useradd -d /code xf
+RUN mkdir -p /code
 RUN chown -R xf:xf /code

 RUN mkdir -p /conf/static
@ -16,7 +16,7 @@ USER xf
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 WORKDIR /code
-COPY --chown=xf:xf requirements.txt /code/
+COPY requirements.txt /code/
 RUN python -m venv /venv
 RUN . /venv/bin/activate && pip install -r requirements.txt

@ -25,4 +25,4 @@ RUN . /venv/bin/activate && pip install -r requirements.txt
 CMD if [ "$OPERATION" = "uwsgi" ] ; then . /venv/bin/activate && uwsgi --ini /conf/uwsgi.ini ; else . /venv/bin/activate && exec python manage.py runserver 0.0.0.0:8000; fi

 # CMD . /venv/bin/activate && uvicorn --reload --reload-include *.html --workers 2 --uds /var/run/socks/app.sock app.asgi:application
-# CMD . /venv/bin/activate && gunicorn -b 0.0.0.0:8000 --reload app.asgi:application -k uvicorn.workers.UvicornWorker
+# CMD . /venv/bin/activate && gunicorn -b 0.0.0.0:8000 --reload app.asgi:application -k uvicorn.workers.UvicornWorker
--- a/18
+++ b/18
@ -1,26 +1,26 @@
 run:
-	podman-compose --env-file=stack.env up -d
+	docker-compose --env-file=stack.env up -d

 build:
-	podman-compose --env-file=stack.env build
+	docker-compose --env-file=stack.env build

 stop:
-	podman-compose --env-file=stack.env down
+	docker-compose --env-file=stack.env down

 log:
-	podman-compose --env-file=stack.env logs -f
+	docker-compose --env-file=stack.env logs -f

 test:
-	podman-compose --env-file=stack.env run -e LIVE=$(LIVE) --rm app sh -c ". /venv/bin/activate && python manage.py test $(MODULES) -v 2"
+	docker-compose --env-file=stack.env run -e LIVE=$(LIVE) --rm app sh -c ". /venv/bin/activate && python manage.py test $(MODULES) -v 2"

 migrate:
-	podman-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py migrate"
+	docker-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py migrate"

 makemigrations:
-	podman-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py makemigrations"
+	docker-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py makemigrations"

 auth:
-	podman-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py createsuperuser"
+	docker-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py createsuperuser"

 token:
-	podman-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py addstatictoken m"
+	docker-compose --env-file=stack.env run --rm app sh -c ". /venv/bin/activate && python manage.py addstatictoken m"
--- a/app/settings.py
+++ b/app/settings.py
@ -57,20 +57,18 @@ INSTALLED_APPS = [
 ]


-# Performance optimisations # COMMENTED DUE TO PODMAN ISSUE
-# CACHES = {
-#     "default": {
-#         "BACKEND": "django.core.cache.backends.redis.RedisCache",
-#         "LOCATION": "unix:///var/run/socks/redis.sock",
-#         "OPTIONS": {
-#             "db": "10",
-#             "parser_class": "redis.connection.HiredisParser",
-#             "pool_class": "redis.BlockingConnectionPool",
-#         },
-#     }
-# }
-# END PODMAN ISSUE
-
+# Performance optimisations
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
+        "LOCATION": "unix:///var/run/socks/redis.sock",
+        "OPTIONS": {
+            "db": "10",
+            "parser_class": "redis.connection.HiredisParser",
+            "pool_class": "redis.BlockingConnectionPool",
+        },
+    }
+}
 # CACHE_MIDDLEWARE_ALIAS = 'default'
 # CACHE_MIDDLEWARE_SECONDS = '600'
 # CACHE_MIDDLEWARE_KEY_PREFIX = ''
--- a/core/init.py
+++ b/core/init.py
@ -1,6 +1,14 @@
 import os

+import stripe
+from django.conf import settings
+
 os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
 # from redis import StrictRedis

 # r = StrictRedis(unix_socket_path="/var/run/redis/redis.sock", db=0)
+
+if settings.STRIPE_TEST:
+    stripe.api_key = settings.STRIPE_API_KEY_TEST
+else:
+    stripe.api_key = settings.STRIPE_API_KEY_PROD
--- a/core/lib/billing.py
+++ b/core/lib/billing.py
@ -1,16 +1,10 @@
 import stripe
 from django.conf import settings
-
-# from lago_python_client import Client
-from lago_python_client.client import Client
-from lago_python_client.exceptions import LagoApiError
+from lago_python_client import Client
+from lago_python_client.clients.base_client import LagoApiError
 from lago_python_client.models import Customer, CustomerBillingConfiguration

 client = Client(api_key=settings.LAGO_API_KEY, api_url=settings.LAGO_URL)
-if settings.STRIPE_TEST:
-    stripe.api_key = settings.STRIPE_API_KEY_TEST
-else:
-    stripe.api_key = settings.STRIPE_API_KEY_PROD


 def expand_name(first_name, last_name):
--- a/core/trading/market.py
+++ b/core/trading/market.py
@ -412,7 +412,6 @@ def execute_strategy(callback, strategy, func):
        direction=direction,
        **protection,
    )
-    log.debug(f"Created Trade: {new_trade}")
    new_trade.save()

    if strategy.risk_model is not None:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -17,8 +17,8 @@ services:
    # - "8000:8000" # uwsgi socket
    env_file:
      - stack.env
-    # volumes_from:
-    #   - tmp
+    volumes_from:
+      - tmp
    depends_on:
      # redis:
      #   condition: service_healthy
@ -46,11 +46,11 @@ services:
      - fisk_static:${STATIC_ROOT}
    env_file:
      - stack.env
-    # volumes_from:
-    #   - tmp
+    volumes_from:
+      - tmp
    depends_on:
-      # redis:
-      #   condition: service_healthy
+      redis:
+        condition: service_healthy
      migration:
        condition: service_started
      collectstatic:
@ -72,8 +72,8 @@ services:
      - ${PORTAINER_GIT_DIR}:/code
      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
      - fisk_static:${STATIC_ROOT}
-    # volumes_from:
-    #   - tmp
+    volumes_from:
+      - tmp
    env_file:
      - stack.env

@ -89,27 +89,27 @@ services:
      - ${PORTAINER_GIT_DIR}:/code
      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
      - fisk_static:${STATIC_ROOT}
-    # volumes_from:
-    #   - tmp
+    volumes_from:
+      - tmp
    env_file:
      - stack.env

  nginx:
-    image: nginxinc/nginx-unprivileged:latest
+    image: nginx:latest
    container_name: nginx_fisk
    ports:
      - ${APP_PORT}:9999
-    # ulimits:
-    #   nproc: 65535
-    #   nofile:
-    #      soft: 65535
-    #      hard: 65535
+    ulimits:
+      nproc: 65535
+      nofile:
+         soft: 65535
+         hard: 65535
    volumes:
      - ${PORTAINER_GIT_DIR}:/code
      - ${PORTAINER_GIT_DIR}/docker/nginx/conf.d/${OPERATION}.conf:/etc/nginx/conf.d/default.conf
      - fisk_static:${STATIC_ROOT}
-    # volumes_from:
-    #   - tmp
+    volumes_from:
+      - tmp
    networks:
      - default
      - xf
@ -124,36 +124,33 @@ services:
    #   redis:
    #     condition: service_healthy

-  # tmp:
-  #   image: busybox
-  #   container_name: tmp_fisk
-  #   command: chmod -R 777 /var/run/socks
-  #   volumes:
-  #     - /var/run/socks
+  tmp:
+    image: busybox
+    container_name: tmp_fisk
+    command: chmod -R 777 /var/run/socks
+    volumes:
+      - /var/run/socks

-  # # For caching
-  # redis:
-  #   image: redis
-  #   container_name: redis_fisk
-  #   command: redis-server /etc/redis.conf
-  #   #ulimits:
-  #   #  nproc: 65535
-  #   #  nofile:
-  #   #     soft: 65535
-  #   #     hard: 65535
-  #   volumes:
-  #     - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
-  #     - fisk_redis_data:/data
-  #   volumes_from:
-  #     - tmp
-  #   healthcheck:
-  #     test: "redis-cli -s /var/run/socks/redis.sock ping"
-  #     interval: 2s
-  #     timeout: 2s
-  #     retries: 15
-  #   depends_on:
-  #     tmp:
-  #       condition: service_started
+  # For caching
+  redis:
+    image: redis
+    container_name: redis_fisk
+    command: redis-server /etc/redis.conf
+    ulimits:
+      nproc: 65535
+      nofile:
+         soft: 65535
+         hard: 65535
+    volumes:
+      - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
+      - fisk_redis_data:/data
+    volumes_from:
+      - tmp
+    healthcheck:
+      test: "redis-cli -s /var/run/socks/redis.sock ping"
+      interval: 2s
+      timeout: 2s
+      retries: 15

  # pyroscope:
  #   image: "pyroscope/pyroscope:latest"