From e9d28c472d950a7f4b978ef9d345438ac625a7d3 Mon Sep 17 00:00:00 2001
From: tobias <tobias-ahlqvist@outlook.com>
Date: Mon, 17 Jun 2024 15:39:11 +0200
Subject: [PATCH] Clean up drone and docker-compose

---
 .drone.yml         |  4 ----
 docker-compose.yml | 51 ++++++++++++++--------------------------------
 2 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b8e2ec7..a9220b0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,12 +24,8 @@ steps:
     environment:
       DOMAIN: nextload.swarm-demo.autonomic.zone
       STACK_NAME: nextload-demo_autonomic_zone
-      SECRET_PAYLOAD_SECRET_VERSION: v1
-      SECRET_TOKEN_VERSION: v1
       SECRET_MONGO_PASSWORD_VERSION: v1
-      NGINX_CONF_VERSION: v1
       REPOSITORY: "autonomic-cooperative/nextload"
       DRONE_URL: "https://drone.autonomic.zone"
-      PAYLOAD_URL: "https://nextload.swarm-demo.autonomic.zone/admin" # Not needed anymore?
     depends_on:
       - publish nextload container
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 058f0c0..8ae3a0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,44 +1,22 @@
 services:
-  astro:
-    container_name: ${NAME}-astro
-    image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-astro:latest
+  nextjs:
+    image: git.autonomic.zone/autonomic-cooperative/nextload:latest
+    container_name: ${NAME}-nextjs
     restart: unless-stopped
-    build:
-      context: astro
-    command: ["yarn", "dev"]
-    environment:
-      DEV: 1
-    networks:
-      - front
-    volumes:
-      - ./astro:/base
-      - /base/node_modules/
-    ports:
-      - 3000:3000
-    depends_on:
-      - payload
-
-  payload:
-    image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload-dev:latest
-    container_name: ${NAME}-payload
-    restart: unless-stopped
-    build:
-      context: payload
-      target: dev
+    # build:
+    #   context: payload
+    #   target: dev
     environment:
       DEV: 1
       NAME: ${NAME}
       NODE_ENV: development
-      PAYLOAD_URL: "http://localhost:${PAYLOAD_PORT}"
-      PAYLOAD_PORT: ${PAYLOAD_PORT}
-      PAYLOAD_SECRET: ${PAYLOAD_SECRET}
-      MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@mongo:27017"
-    volumes:
-      - ./payload/src:/base/src
-      # - ./astro/src/types.ts:/types.ts
-      - payload_media:/base/src/media
+      MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@$MONGODB_HOST:27017"
+    # volumes:
+    #   - ./payload/src:/base/src
+    #   # - ./astro/src/types.ts:/types.ts
+    #   - payload_media:/base/src/media
     ports:
-      - ${PAYLOAD_PORT}:${PAYLOAD_PORT}
+      - 3000:3000
     networks:
       - front
       - back
@@ -49,6 +27,8 @@ services:
     container_name: ${NAME}-mongo
     image: mongo:6.0.5
     restart: unless-stopped
+    ports:
+      - 27017:27017
     volumes:
       - mongo:/data/db
     command:
@@ -56,10 +36,9 @@ services:
     environment:
       MONGO_INITDB_ROOT_USERNAME: ${MONGODB_USER}
       MONGO_INITDB_ROOT_PASSWORD: ${MONGODB_PASSWORD}
+
     networks:
       - back
-    ports:
-      - 27017:27017
 
 networks:
   front: