Clean up drone and docker-compose
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
tobias 2024-06-17 15:39:11 +02:00
parent 80fdf4332f
commit e9d28c472d
2 changed files with 15 additions and 40 deletions

View File

@ -24,12 +24,8 @@ steps:
environment: environment:
DOMAIN: nextload.swarm-demo.autonomic.zone DOMAIN: nextload.swarm-demo.autonomic.zone
STACK_NAME: nextload-demo_autonomic_zone STACK_NAME: nextload-demo_autonomic_zone
SECRET_PAYLOAD_SECRET_VERSION: v1
SECRET_TOKEN_VERSION: v1
SECRET_MONGO_PASSWORD_VERSION: v1 SECRET_MONGO_PASSWORD_VERSION: v1
NGINX_CONF_VERSION: v1
REPOSITORY: "autonomic-cooperative/nextload" REPOSITORY: "autonomic-cooperative/nextload"
DRONE_URL: "https://drone.autonomic.zone" DRONE_URL: "https://drone.autonomic.zone"
PAYLOAD_URL: "https://nextload.swarm-demo.autonomic.zone/admin" # Not needed anymore?
depends_on: depends_on:
- publish nextload container - publish nextload container

View File

@ -1,44 +1,22 @@
services: services:
astro: nextjs:
container_name: ${NAME}-astro image: git.autonomic.zone/autonomic-cooperative/nextload:latest
image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-astro:latest container_name: ${NAME}-nextjs
restart: unless-stopped restart: unless-stopped
build: # build:
context: astro # context: payload
command: ["yarn", "dev"] # target: 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
environment: environment:
DEV: 1 DEV: 1
NAME: ${NAME} NAME: ${NAME}
NODE_ENV: development NODE_ENV: development
PAYLOAD_URL: "http://localhost:${PAYLOAD_PORT}" MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@$MONGODB_HOST:27017"
PAYLOAD_PORT: ${PAYLOAD_PORT} # volumes:
PAYLOAD_SECRET: ${PAYLOAD_SECRET} # - ./payload/src:/base/src
MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@mongo:27017" # # - ./astro/src/types.ts:/types.ts
volumes: # - payload_media:/base/src/media
- ./payload/src:/base/src
# - ./astro/src/types.ts:/types.ts
- payload_media:/base/src/media
ports: ports:
- ${PAYLOAD_PORT}:${PAYLOAD_PORT} - 3000:3000
networks: networks:
- front - front
- back - back
@ -49,6 +27,8 @@ services:
container_name: ${NAME}-mongo container_name: ${NAME}-mongo
image: mongo:6.0.5 image: mongo:6.0.5
restart: unless-stopped restart: unless-stopped
ports:
- 27017:27017
volumes: volumes:
- mongo:/data/db - mongo:/data/db
command: command:
@ -56,10 +36,9 @@ services:
environment: environment:
MONGO_INITDB_ROOT_USERNAME: ${MONGODB_USER} MONGO_INITDB_ROOT_USERNAME: ${MONGODB_USER}
MONGO_INITDB_ROOT_PASSWORD: ${MONGODB_PASSWORD} MONGO_INITDB_ROOT_PASSWORD: ${MONGODB_PASSWORD}
networks: networks:
- back - back
ports:
- 27017:27017
networks: networks:
front: front: