From 81c7b943e0221dd230d24741267e129ce6e2d531 Mon Sep 17 00:00:00 2001 From: Oleksandr Kucherenko Date: Sat, 5 Oct 2024 22:14:22 +0200 Subject: [PATCH 1/3] added redis web ui for developer needs --- docker-compose.dev.yaml | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 55641b1b3..4840ea777 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -1,6 +1,7 @@ services: postiz-postgres: - image: postgres:14.5 + # ref: https://hub.docker.com/_/postgres + image: postgres:17-alpine # 17.0 container_name: postiz-postgres restart: always environment: @@ -13,8 +14,18 @@ services: - 5432:5432 networks: - postiz-network + postiz-redis: + # ref: https://hub.docker.com/_/redis + image: redis:7-alpine # 7.4.0 + container_name: postiz-redis + restart: always + ports: + - 6379:6379 + networks: + - postiz-network postiz-pg-admin: - image: dpage/pgadmin4 + # ref: https://hub.docker.com/r/dpage/pgadmin4/tags + image: dpage/pgadmin4:latest container_name: postiz-pg-admin restart: always ports: @@ -24,14 +35,22 @@ services: PGADMIN_DEFAULT_PASSWORD: admin networks: - postiz-network - postiz-redis: - image: redis:7.2 - container_name: postiz-redis - restart: always + postiz-redisinsight: + # ref: https://hub.docker.com/r/redis/redisinsight + image: redis/redisinsight:latest + container_name: postiz-redisinsight + links: + - postiz-redis ports: - - 6379:6379 + - "5540:5540" + volumes: + - redisinsight:/data + networks: + - postiz-network + restart: always volumes: + redisinsight: postgres-volume: external: false From b62abdced96f4aec864f5a8f90685178016fbd3c Mon Sep 17 00:00:00 2001 From: Oleksandr Kucherenko Date: Sat, 5 Oct 2024 22:15:02 +0200 Subject: [PATCH 2/3] updated ignore files, .secrets folder exclude --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 9c12a0b30..f2be18215 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,11 @@ Thumbs.db # Vim files **/*.swp **/*.swo + +# Temporary files +*.orig +*.~*~ +*.tsbuildinfo + +# ignore Secrets folder +.secrets/ From 00447296d746982b5b5edac7024e2156b904da72 Mon Sep 17 00:00:00 2001 From: Oleksandr Kucherenko Date: Sat, 5 Oct 2024 22:15:46 +0200 Subject: [PATCH 3/3] added dev:docker helper script into package.json --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 744288a13..856b5ca6c 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dev:backend": "npx nx run backend:serve:development", "dev:workers": "npx nx run workers:serve:development", "dev:cron": "npx nx run cron:serve:development", + "dev:docker": "docker compose -f ./docker-compose.dev.yaml up -d", "start:prod": "node dist/apps/backend/main.js", "start:prod:frontend": "nx run frontend:serve:production", "start:prod:workers": "node dist/apps/workers/main.js", @@ -193,5 +194,8 @@ "typescript": "5.5.4", "vite": "^5.0.0", "vitest": "1.6.0" + }, + "volta": { + "node": "20.17.0" } }