Merge pull request #975 from parlemonde/david/2024-reset

Reset database migrations and add initial file
parlemonde · Aug 29, 2024 · 3f1f764 · 3f1f764
2 parents 8d38230 + 62624eb
commit 3f1f764
Show file tree

Hide file tree

Showing 21 changed files with 225 additions and 971 deletions.
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
@@ -1,29 +1,27 @@
-# services:
-#   mysql:
-#     image: mysql:8
-#     environment:
-#       - MYSQL_ROOT_PASSWORD=my-secret-pw
-#     healthcheck:
-#       test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
-#       timeout: 20s
-#       retries: 10
-#     ports:
-#       - '3306:3306'
-#       - '33060:33060'
-#     volumes:
-#       - ./.mysql-data:/var/lib/mysql
-#   minio:
-#     image: minio/minio
-#     ports:
-#       - '9000:9000'
-#       - '9090:9090'
-#     environment:
-#       - MINIO_ROOT_USER=minioadmin
-#       - MINIO_ROOT_PASSWORD=minioadmin
-#       - MINIO_ACCESS_KEY=minio
-#       - MINIO_SECRET_KEY=minio123
-#     volumes:
-#       - ./.minio-data:/data
-#     command: server --console-address ":9090" /data
-
-
+services:
+  mysql:
+    image: mysql:8
+    environment:
+      - MYSQL_ROOT_PASSWORD=my-secret-pw
+    healthcheck:
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
+      timeout: 20s
+      retries: 10
+    ports:
+      - '3306:3306'
+      - '33060:33060'
+    volumes:
+      - ./.mysql-data:/var/lib/mysql
+  minio:
+    image: minio/minio
+    ports:
+      - '9000:9000'
+      - '9090:9090'
+    environment:
+      - MINIO_ROOT_USER=minioadmin
+      - MINIO_ROOT_PASSWORD=minioadmin
+      - MINIO_ACCESS_KEY=minio
+      - MINIO_SECRET_KEY=minio123
+    volumes:
+      - ./.minio-data:/data
+    command: server --console-address ":9090" /data
diff --git a/server/migrations/1675763011163-AlterGame.ts b/server/migrations/1675763011163-AlterGame.ts
diff --git a/server/migrations/1675763051163-CreateClassroomTable.ts b/server/migrations/1675763051163-CreateClassroomTable.ts
diff --git a/server/migrations/1675763075677-CreateStudentTable.ts b/server/migrations/1675763075677-CreateStudentTable.ts
diff --git a/server/migrations/1675763247781-CreateUserStudentTable.ts b/server/migrations/1675763247781-CreateUserStudentTable.ts
diff --git a/server/migrations/1675763496759-AlterActivityTable.ts b/server/migrations/1675763496759-AlterActivityTable.ts
diff --git a/server/migrations/1675763659256-AlterUserTable.ts b/server/migrations/1675763659256-AlterUserTable.ts
diff --git a/server/migrations/1678113524215-alterToken.ts b/server/migrations/1678113524215-alterToken.ts