Docker Cleanup

.build-files/docker-compose-local.template.yml

@@ -19,60 +19,6 @@ services:
       - path: ${DOCKER_ENV_FILE} # relative to docker compose (has to be in same directory)
         required: true
 
-  # Depends on database. Database must be healthy before starting server
-  server:
-    build:
-      context: ../ # relative to docker compose
-      dockerfile: ./.build-files/Dockerfile.server # relatvie to build context
-      args:
-        DOCKER_ENV_FILE: ${DOCKER_ENV_FILE}
-    ports:
-      - "8000:8000"
-    environment:
-      - DJANGO_ENV_FILE=/app/.env
-
-  celery:
-    build:
-      context: ../ # relative to docker compose
-      dockerfile: ./.build-files/Dockerfile.celery # relatvie to build context
-      args:
-        DOCKER_ENV_FILE: ${DOCKER_ENV_FILE}
-    command: [ "celery", "--app", "celery_app", "worker", "--loglevel", "info", "--without-heartbeat", "-c", "4" ]
-    # Docker Compose does not set the TTY width, which causes Celery errors
-    tty: false
-    environment:
-      DJANGO_ENV_FILE: "/app/.env"
-
-  # MySQL service. Has healthcheck which uses mysqladmin to ping before reporting healthy.
-  db:
-    image: mysql:latest
-    environment:
-      MYSQL_DATABASE: ${DATABASE_NAME}
-      MYSQL_USER: ${DATABASE_USER}
-      MYSQL_PASSWORD: ${DATABASE_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${DATABASE_ROOT_PASSWORD}
-    volumes:
-      - mysql-data:/var/lib/mysql
-    ports:
-      - "3306:3306"
-    healthcheck:
-      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${DATABASE_ROOT_PASSWORD}" ]
-      timeout: 20s
-      retries: 10
-    env_file:
-      - path: ${DOCKER_ENV_FILE} # relative to docker compose (has to be in same directory)
-        required: true
-
-  redis:
-    image: redis:latest
-    ports:
-      - "6379:6379"
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
   data:
     build:
       context: ./
@@ -91,6 +37,5 @@ services:
       - duckdb-data:/app/duckdb-data
 
 volumes:
-  mysql-data:
   duckdb-data:
-  migrations_volume:
+  migrations_volume:

.build-files/nginx-http-local.conf

@@ -21,13 +21,6 @@ http {
             try_files $uri $uri/ /index.html;
         }
 
-        # location /api {
-        #     proxy_pass http://server:8000/api;
-        #     proxy_set_header Host $host;
-        #     proxy_set_header X-Real-IP $remote_addr;
-        #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #     proxy_set_header X-Forwarded-Proto $scheme;
-        # }
 
         location /data {
             proxy_pass http://data:9000/;

apps/client/src/App.vue

@@ -60,7 +60,6 @@ onBeforeMount(() => {
         >
             <q-toolbar>
                 <q-toolbar-title>Loon</q-toolbar-title>
-                <BasicInfoCounts />
                 <l-btn
                     @click="router.push('/')"
                     type="basic"

apps/client/src/main.ts

@@ -13,7 +13,6 @@ import LooneageViewGL from './components/LooneageViewGL.vue';
 import LooneageViewSettingsSidebar from './components/LooneageViewSettingsSidebar.vue';
 import LooneageViewSettingsToolbar from './components/LooneageViewSettingsToolbar.vue';
 import BasicInfo from './components/BasicInfo.vue';
-import BasicInfoCounts from './components/BasicInfoCounts.vue';
 import SimpleTable from './components/SimpleTable.vue';
 import ImageViewer from './components/ImageViewer.vue';
 import ImageViewerSettingsSidebar from './components/ImageViewerSettingsSidebar.vue';
@@ -93,7 +92,6 @@ createApp(App)
     .component('LooneageViewSettingsSidebar', LooneageViewSettingsSidebar)
     .component('LooneageViewSettingsToolbar', LooneageViewSettingsToolbar)
     .component('BasicInfo', BasicInfo)
-    .component('BasicInfoCounts', BasicInfoCounts)
     .component('SimpleTable', SimpleTable)
     .component('NoDataSplash', NoDataSplash)
     .component('StubView', StubView)