Merge branch 'main' into t-work

.drone.yml

@@ -14,7 +14,20 @@ steps:
       registry: git.autonomic.zone
       context: astro
       dockerfile: astro/Dockerfile
-  - name: publish payload container
+  - name: publish payload dev container
+    image: plugins/docker
+    settings:
+      username: 3wordchant
+      password:
+        from_secret: git_autonomic_zone_token_3wc
+      # NOTE: edit this if you want your image called something else
+      repo: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload-dev
+      auto_tag: true
+      registry: git.autonomic.zone
+      context: payload
+      dockerfile: payload/Dockerfile
+      target: dev
+  - name: publish payload prod container
     image: plugins/docker
     settings:
       username: 3wordchant
@@ -46,7 +59,7 @@ steps:
       DRONE_URL: "https://drone.autonomic.zone"
       PAYLOAD_URL: "https://admin.paystro.swarm-demo.autonomic.zone"
     depends_on:
-      - publish payload container
+      - publish payload prod container
 trigger:
   branch:
     - main

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - payload
 
   payload:
-    image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload:latest
+    image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload-dev:latest
     container_name: ${NAME}-payload
     restart: unless-stopped
     build:
@@ -31,15 +31,11 @@ services:
       PAYLOAD_URL: "http://localhost:${PAYLOAD_PORT}"
       PAYLOAD_PORT: ${PAYLOAD_PORT}
       PAYLOAD_SECRET: ${PAYLOAD_SECRET}
-      MONGODB_USER:
-      MONGODB_HOST: mongo
-      MONGODB_PASSWORD:
-      MONGODB_PORT: 27017
+      MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@mongo:27017"
     volumes:
       - ./payload/src:/base/src
-      - ./astro/src/types.ts:/types.ts
-    volumes:
-      - payload_media:/prod/dist/media
+      # - ./astro/src/types.ts:/types.ts
+      - payload_media:/base/src/media
     ports:
       - ${PAYLOAD_PORT}:${PAYLOAD_PORT}
     networks:

package.json

@@ -4,8 +4,8 @@
   "license": "AGPL-3.0-or-later",
   "version": "1.2",
   "scripts": {
-    "dev": "docker compose up",
+    "dev": "docker compose up --build",
     "stop": "docker compose down",
-    "dev:build": "docker compose up --build"
+    "dev:nobuild": "docker compose up"
   }
 }

payload/Dockerfile

@@ -9,7 +9,6 @@ ENV NODE_ENV=development
 EXPOSE 3001
 CMD ["yarn","dev"]
 
-
 FROM base AS build
 ENV NODE_ENV=production
 WORKDIR /build