.gitignore

@@ -158,4 +158,3 @@ cython_debug/
 .vscode/
 core/static/admin
 core/static/debug_toolbar
-Makefile

Makefile-dev

@@ -1,26 +0,0 @@
-run:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env up -d
-
-build:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env build
-
-stop:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env down
-
-log:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env logs -f
-
-test:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env run -e LIVE=$(LIVE) --rm app_dev sh -c ". /venv/bin/activate && python manage.py test $(MODULES) -v 2"
-
-migrate:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env run --rm app_dev sh -c ". /venv/bin/activate && python manage.py migrate"
-
-makemigrations:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env run --rm app_dev sh -c ". /venv/bin/activate && python manage.py makemigrations"
-
-auth:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env run --rm app_dev sh -c ". /venv/bin/activate && python manage.py createsuperuser"
-
-token:
-	docker-compose -f docker-compose.dev.yml --env-file=stack.env run --rm app_dev sh -c ". /venv/bin/activate && python manage.py addstatictoken m"

core/lib/billing.py

@@ -1,7 +1,7 @@
 import stripe
 from django.conf import settings
 from lago_python_client import Client
-from lago_python_client.exceptions import LagoApiError
+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)

docker-compose.dev.yml

@@ -1,174 +0,0 @@
-version: "3.8"
-
-name: fisk_dev
-
-services:
-  app_dev:
-    image: xf/fisk:dev
-    container_name: fisk_dev
-    build:
-      context: .
-      args:
-        OPERATION: ${OPERATION}
-    volumes:
-      - ${PORTAINER_GIT_DIR}:/code
-      - ${PORTAINER_GIT_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
-      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
-      - fisk_static_dev:${STATIC_ROOT}
-    #ports:
-    # - "8000:8000" # uwsgi socket
-    env_file:
-      - stack.env
-    volumes_from:
-      - tmp_dev
-    depends_on:
-      # redis:
-      #   condition: service_healthy
-      migration_dev:
-        condition: service_started
-      collectstatic_dev:
-        condition: service_started
-    networks:
-      - default
-      - xf
-      - elastic
-
-  scheduling_dev:
-    image: xf/fisk:dev
-    container_name: scheduling_fisk_dev
-    build:
-      context: .
-      args:
-        OPERATION: ${OPERATION}
-    command: sh -c '. /venv/bin/activate && python manage.py scheduling'
-    volumes:
-      - ${PORTAINER_GIT_DIR}:/code
-      - ${PORTAINER_GIT_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
-      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
-      - fisk_static_dev:${STATIC_ROOT}
-    env_file:
-      - stack.env
-    volumes_from:
-      - tmp_dev
-    depends_on:
-      redis_dev:
-        condition: service_healthy
-      migration_dev:
-        condition: service_started
-      collectstatic_dev:
-        condition: service_started
-    networks:
-      - default
-      - xf
-      - elastic
-
-  migration_dev:
-    image: xf/fisk:dev
-    container_name: migration_fisk_dev
-    build:
-      context: .
-      args:
-        OPERATION: ${OPERATION}
-    command: sh -c '. /venv/bin/activate && python manage.py migrate --noinput'
-    volumes:
-      - ${PORTAINER_GIT_DIR}:/code
-      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
-      - fisk_static_dev:${STATIC_ROOT}
-    volumes_from:
-      - tmp_dev
-    env_file:
-      - stack.env
-
-  collectstatic_dev:
-    image: xf/fisk:dev
-    container_name: collectstatic_fisk_dev
-    build:
-      context: .
-      args:
-        OPERATION: ${OPERATION}
-    command: sh -c '. /venv/bin/activate && python manage.py collectstatic --noinput'
-    volumes:
-      - ${PORTAINER_GIT_DIR}:/code
-      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
-      - fisk_static_dev:${STATIC_ROOT}
-    volumes_from:
-      - tmp_dev
-    env_file:
-      - stack.env
-
-  nginx_dev:
-    image: nginx:latest
-    container_name: nginx_fisk_dev
-    ports:
-      - ${APP_PORT}:9999
-    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_dev:${STATIC_ROOT}
-    volumes_from:
-      - tmp_dev
-    networks:
-      - default
-      - xf
-    depends_on:
-      app_dev:
-        condition: service_started
-
-
-    # volumes_from:
-    #   - tmp
-    # depends_on:
-    #   redis:
-    #     condition: service_healthy
-
-  tmp_dev:
-    image: busybox
-    container_name: tmp_fisk_dev
-    command: chmod -R 777 /var/run/socks
-    volumes:
-      - /var/run/socks
-
-  # For caching
-  redis_dev:
-    image: redis
-    container_name: redis_fisk_dev
-    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_dev:/data
-    volumes_from:
-      - tmp_dev
-    healthcheck:
-      test: "redis-cli -s /var/run/socks/redis.sock ping"
-      interval: 2s
-      timeout: 2s
-      retries: 15
-
-  # pyroscope:
-  #   image: "pyroscope/pyroscope:latest"
-  #   ports:
-  #     - "4040:4040"
-  #   command:
-  #     - "server"
-
-networks:
-  default:
-    driver: bridge
-  xf:
-    external: true
-  elastic:
-    external: true
-
-volumes:
-  fisk_static_dev: {}
-  fisk_redis_data_dev: {}

docker/nginx/conf.d/dev.conf

@@ -1,7 +1,7 @@
 upstream django {
     #server app:8000;
     #server unix:///var/run/socks/app.sock;
-    server app_dev:8000; # won't work in production mode
+    server app:8000;
 }
 
 server {