diff --git a/API b/API index 8f87568edb45cae354d840f0304fea770c41f0d7..a4e246cf313cfc35a27338142c76dd410a85432c 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8f87568edb45cae354d840f0304fea770c41f0d7 +Subproject commit a4e246cf313cfc35a27338142c76dd410a85432c diff --git a/Database/docker-entrypoint-initdb.d/1-Dojo.sql b/Database/docker-entrypoint-initdb.d/1-Dojo.sql deleted file mode 100644 index 5004ed7a4aac75f79d402ff4239810a46e2ae046..0000000000000000000000000000000000000000 --- a/Database/docker-entrypoint-initdb.d/1-Dojo.sql +++ /dev/null @@ -1,180 +0,0 @@ -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -START TRANSACTION; -SET time_zone = "+00:00"; - --- --- Base de données : `Dojo` --- -CREATE DATABASE IF NOT EXISTS `Dojo` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -USE `Dojo`; - --- -------------------------------------------------------- - --- --- Structure de la table `Enonce` --- - -CREATE TABLE `Enonce` ( - `enonceID` int(11) NOT NULL, - `enonceName` varchar(64) NOT NULL, - `enonceGitLink` text NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- -------------------------------------------------------- - --- --- Structure de la table `EnonceStaff` --- - -CREATE TABLE `EnonceStaff` ( - `enonceID` int(11) NOT NULL, - `userID` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- -------------------------------------------------------- - --- --- Structure de la table `Exercice` --- - -CREATE TABLE `Exercice` ( - `exerciceID` int(11) NOT NULL, - `exerciceEnonceID` int(11) NOT NULL, - `exerciceProjectKey` varchar(36) NOT NULL, - `exerciceGitLink` text NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- -------------------------------------------------------- - --- --- Structure de la table `ExerciceMembers` --- - -CREATE TABLE `ExerciceMembers` ( - `exerciceID` int(11) NOT NULL, - `userID` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- -------------------------------------------------------- - --- --- Structure de la table `Results` --- - -CREATE TABLE `Results` ( - `resultTimestamp` bigint(20) NOT NULL, - `resultExerciceID` int(11) NOT NULL, - `resultPass` tinyint(1) NOT NULL, - `resultDetails` text NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- -------------------------------------------------------- - --- --- Structure de la table `Users` --- - -CREATE TABLE `Users` ( - `userID` int(11) NOT NULL, - `userFirstname` varchar(32) NOT NULL, - `userLastname` varchar(32) NOT NULL, - `userMail` varchar(32) NOT NULL, - `userRole` varchar(8) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- --- Index pour les tables déchargées --- - --- --- Index pour la table `Enonce` --- -ALTER TABLE `Enonce` - ADD PRIMARY KEY (`enonceID`); - --- --- Index pour la table `EnonceStaff` --- -ALTER TABLE `EnonceStaff` - ADD PRIMARY KEY (`enonceID`,`userID`), - ADD KEY `userID` (`userID`); - --- --- Index pour la table `Exercice` --- -ALTER TABLE `Exercice` - ADD PRIMARY KEY (`exerciceID`), - ADD KEY `exerciceEnonceID` (`exerciceEnonceID`); - --- --- Index pour la table `ExerciceMembers` --- -ALTER TABLE `ExerciceMembers` - ADD PRIMARY KEY (`exerciceID`,`userID`), - ADD KEY `userID` (`userID`); - --- --- Index pour la table `Results` --- -ALTER TABLE `Results` - ADD PRIMARY KEY (`resultTimestamp`,`resultExerciceID`), - ADD KEY `resultExerciceID` (`resultExerciceID`); - --- --- Index pour la table `Users` --- -ALTER TABLE `Users` - ADD PRIMARY KEY (`userID`); - --- --- AUTO_INCREMENT pour les tables déchargées --- - --- --- AUTO_INCREMENT pour la table `Enonce` --- -ALTER TABLE `Enonce` - MODIFY `enonceID` int(11) NOT NULL AUTO_INCREMENT; - --- --- AUTO_INCREMENT pour la table `Exercice` --- -ALTER TABLE `Exercice` - MODIFY `exerciceID` int(11) NOT NULL AUTO_INCREMENT; - --- --- AUTO_INCREMENT pour la table `Users` --- -ALTER TABLE `Users` - MODIFY `userID` int(11) NOT NULL AUTO_INCREMENT; - --- --- Contraintes pour les tables déchargées --- - --- --- Contraintes pour la table `EnonceStaff` --- -ALTER TABLE `EnonceStaff` - ADD CONSTRAINT `EnonceStaff_ibfk_1` FOREIGN KEY (`enonceID`) REFERENCES `Enonce` (`enonceID`), - ADD CONSTRAINT `EnonceStaff_ibfk_2` FOREIGN KEY (`userID`) REFERENCES `Users` (`userID`); - --- --- Contraintes pour la table `Exercice` --- -ALTER TABLE `Exercice` - ADD CONSTRAINT `Exercice_ibfk_1` FOREIGN KEY (`exerciceEnonceID`) REFERENCES `Enonce` (`enonceID`); - --- --- Contraintes pour la table `ExerciceMembers` --- -ALTER TABLE `ExerciceMembers` - ADD CONSTRAINT `ExerciceMembers_ibfk_1` FOREIGN KEY (`exerciceID`) REFERENCES `Exercice` (`exerciceID`), - ADD CONSTRAINT `ExerciceMembers_ibfk_2` FOREIGN KEY (`userID`) REFERENCES `Users` (`userID`); - --- --- Contraintes pour la table `Results` --- -ALTER TABLE `Results` - ADD CONSTRAINT `Results_ibfk_1` FOREIGN KEY (`resultExerciceID`) REFERENCES `Exercice` (`exerciceID`); -COMMIT; diff --git a/Dockerfile_Dojo_Database b/Dockerfile_Dojo_Database deleted file mode 100644 index 9e9c6061f6692e96e7168faf2a462d71cf0c3df4..0000000000000000000000000000000000000000 --- a/Dockerfile_Dojo_Database +++ /dev/null @@ -1,4 +0,0 @@ -FROM mariadb:10.11 -LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>" - -ADD Database/docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 284287ee2eac393f27a06c053963a1d2b50bfff8..afa348bcfd9d3b2b6e51f537a21981ac3ab14cbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,7 @@ version: '3.8' services: dojo-database: container_name: dojo-database - build: - context: ./ - dockerfile: Dockerfile_Dojo_Database + image: mariadb:11.0 environment: MARIADB_DATABASE: '${DATABASE_NAME}' MARIADB_ROOT_PASSWORD: '${DATABASE_ROOT_PASSWORD}'