From f425decf2ca11da8b8ebfdd0640e3a593bbc5ef5 Mon Sep 17 00:00:00 2001 From: Sonny Date: Mon, 7 Oct 2024 01:30:18 +0200 Subject: [PATCH] chore: rename compose files and use major release tag for postgres and pgadmin --- .env.example | 2 +- Makefile | 8 +++++--- docker-compose.yml => compose.yml | 2 +- dev.docker-compose.yml => dev.compose.yml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) rename docker-compose.yml => compose.yml (97%) rename dev.docker-compose.yml => dev.compose.yml (96%) diff --git a/.env.example b/.env.example index ebbcf90..1263b80 100644 --- a/.env.example +++ b/.env.example @@ -13,4 +13,4 @@ DB_PASSWORD=my-links-pwd DB_DATABASE=my-links GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= -GOOGLE_CLIENT_CALLBACK_URL=http://localhost:3333/auth/callback \ No newline at end of file +GOOGLE_CLIENT_CALLBACK_URL=http://localhost:3333/auth/callback diff --git a/Makefile b/Makefile index 64bb9a1..733a59f 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,13 @@ dev: @docker compose down - @docker compose -f dev.docker-compose.yml up -d --wait + @docker compose -f dev.compose.yml pull + @docker compose -f dev.compose.yml up -d --wait @node ace migration:fresh @pnpm run dev prod: - @docker compose -f dev.docker-compose.yml down + @docker compose -f dev.compose.yml down + @docker compose pull @docker compose up -d --build --wait seed: @@ -13,7 +15,7 @@ seed: down: @-docker compose down - @-docker compose -f dev.docker-compose.yml down + @-docker compose -f dev.compose.yml down release: @pnpm run release diff --git a/docker-compose.yml b/compose.yml similarity index 97% rename from docker-compose.yml rename to compose.yml index 511969b..070b1e9 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -17,7 +17,7 @@ services: pgadmin: container_name: pgadmin - image: dpage/pgadmin4:8.6 + image: dpage/pgadmin4:8 restart: always healthcheck: test: ['CMD', 'wget', '-O', '-', 'http://localhost:80/misc/ping'] diff --git a/dev.docker-compose.yml b/dev.compose.yml similarity index 96% rename from dev.docker-compose.yml rename to dev.compose.yml index f34f761..ff26c2b 100644 --- a/dev.docker-compose.yml +++ b/dev.compose.yml @@ -17,7 +17,7 @@ services: pgadmin: container_name: pgadmin - image: dpage/pgadmin4:8.6 + image: dpage/pgadmin4:8 restart: always environment: - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com