Skip to content

Commit

Permalink
fix(backend.yaml): wait for services to be healthy
Browse files Browse the repository at this point in the history
  • Loading branch information
alexis-moins committed Nov 20, 2023
1 parent a3c580f commit 3501a48
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 82 deletions.
12 changes: 5 additions & 7 deletions .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ FRONTEND_PORT=3000
ADMINER_PORT=8080
ADMINER_DESIGN=lucas-sandery

MYSQL_ROOT_PASSWORD=root
POSTGRES_USER=john
POSTGRES_PASSWORD=doe

MYSQL_USER=john
MYSQL_PASSWORD=doe

# Needs root privileges to manage DB
DATABASE_URL=mysql://root:root@database:3306/count_of_money
TEST_DATABASE_URL=mysql://root:root@database:3306/count_of_money_test
# Note: change user:password to match the fields above!
DATABASE_URL=postgresql://john:doe@database:5432/count_of_money?schema=public
TEST_DATABASE_URL=postgresql://john:doe@database:5432/count_of_money_test?schema=public
5 changes: 1 addition & 4 deletions .github/workflows/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ jobs:
- name: Set environment variables
run: cp .env.local .env

- name: Build test docker image
run: docker compose build --no-cache test

- name: Start tests
run: docker-compose up database test
run: docker compose up database test
2 changes: 1 addition & 1 deletion back/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
set -ex

npx prisma generate
npx prisma migrate dev
npx prisma migrate deploy

npm run dev

This file was deleted.

50 changes: 0 additions & 50 deletions back/prisma/migrations/20231113152055_add_lucia_auth/migration.sql

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
-- CreateTable
CREATE TABLE "User" (
"id" TEXT NOT NULL,

CONSTRAINT "User_pkey" PRIMARY KEY ("id")
);

-- CreateTable
CREATE TABLE "Session" (
"id" TEXT NOT NULL,
"user_id" TEXT NOT NULL,
"active_expires" BIGINT NOT NULL,
"idle_expires" BIGINT NOT NULL,

CONSTRAINT "Session_pkey" PRIMARY KEY ("id")
);

-- CreateTable
CREATE TABLE "Key" (
"id" TEXT NOT NULL,
"hashed_password" TEXT,
"user_id" TEXT NOT NULL,

CONSTRAINT "Key_pkey" PRIMARY KEY ("id")
);

-- CreateIndex
CREATE UNIQUE INDEX "User_id_key" ON "User"("id");

-- CreateIndex
CREATE UNIQUE INDEX "Session_id_key" ON "Session"("id");

-- CreateIndex
CREATE INDEX "Session_user_id_idx" ON "Session"("user_id");

-- CreateIndex
CREATE UNIQUE INDEX "Key_id_key" ON "Key"("id");

-- CreateIndex
CREATE INDEX "Key_user_id_idx" ON "Key"("user_id");

-- AddForeignKey
ALTER TABLE "Session" ADD CONSTRAINT "Session_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "Key" ADD CONSTRAINT "Key_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
2 changes: 1 addition & 1 deletion back/prisma/migrations/migration_lock.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Please do not edit this file manually
# It should be added in your version-control system (i.e. Git)
provider = "mysql"
provider = "postgresql"
2 changes: 1 addition & 1 deletion back/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ generator client {
}

datasource db {
provider = "mysql"
provider = "postgresql"
url = env("DATABASE_URL")
}

Expand Down
16 changes: 7 additions & 9 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- ./back/package.json:/app/package.json

depends_on:
- database
- database

test:
build: ./back
Expand All @@ -36,7 +36,7 @@ services:
- ./back/package.json:/app/package.json

depends_on:
- database
- database

adminer:
image: adminer
Expand All @@ -54,20 +54,18 @@ services:
- database:db

database:
image: mysql:8.0
image: postgres:16-alpine
container_name: database

restart: always

environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: count_of_money

MYSQL_USER: ${MYSQL_USER}
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
POSTGRES_DB: count_of_money
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

volumes:
- database-data:/var/lib/mysql
- database-data:/var/lib/postgresql/data

volumes:
database-data:

0 comments on commit 3501a48

Please sign in to comment.