further work

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
mooxl · Dec 20, 2023 · 51c5a67 · 51c5a67
1 parent f0aae1d
commit 51c5a67
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 1,913 deletions.
diff --git a/.env b/.env
@@ -4,10 +4,8 @@ PAYLOAD_HOST=localhost:3000
 PAYLOAD_URL=http://localhost:3000
 PAYLOAD_PORT=3000
 PAYLOAD_SECRET=supersecretkey
-MONGODB_URI=mongodb://payload:test@mongo:27017
-MONGODB_USER=payload
-MONGODB_PW=test
+DATABASE_URI=postgresql://postgres:postgres@localhost:5432/postgres
+DATABASE_USER=postgres
+DATABASE_PASSWORD=postgres
 TOKEN=supersecrettoken
 REPOSITORY=mooxl/astroad
-DATABASE_URI=postgresql://postgres:postgres@localhost:5432/postgres
-PAYLOAD_SECRET=secret
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,12 +2,12 @@ services:
   db:
     image: postgres
     environment:
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_USER: postgres
-      POSTGRES_DB: postgres
-    ports:
-      - 5432:5432
+      POSTGRES_DB: payload
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
     volumes:
       - ./data:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
 
 
diff --git a/package.json b/package.json
@@ -1,16 +1,14 @@
 {
   "name": "astroad",
-  "description": "A pre-configured setup for easy website development with Astro and Payload CMS.",
+  "description": "An pre-configured environment for convenient web development using Astro and Payload CMS, ready for deployment on your own VPS.",
   "license": "MIT",
   "version": "2.0",
   "scripts": {
-    "dev": "dotenv -- turbo run dev"
+    "dev": "docker compose up -d && dotenv -- turbo run dev"
   },
   "devDependencies": {
     "@biomejs/biome": "1.4.1",
     "dotenv-cli": "7.3.0",
-    "prettier": "3.1.1",
-    "prettier-plugin-packagejson": "2.4.7",
     "turbo": "1.11.2"
   },
   "resolutions": {

diff --git a/payload/package.json b/payload/package.json
@@ -16,7 +16,6 @@
   "dependencies": {
     "@payloadcms/bundler-webpack": "^1.0.0",
     "@payloadcms/db-postgres": "^0.x",
-    "@payloadcms/plugin-cloud": "^2.0.0",
     "@payloadcms/richtext-lexical": "^0.4.1",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",

diff --git a/payload/src/payload.config.ts b/payload/src/payload.config.ts
@@ -21,7 +21,8 @@ export default buildConfig({
   },
   db: postgresAdapter({
     pool: {
-      connectionString: process.env.DATABASE_URI,
+      connectionString:
+        `postgres://${process.env.DATABASE_USER}:${process.env.DATABASE_PASSWORD}@localhost:5432/payload`,
     },
   }),
 });