From 6c225f4d477bb55c367ffb48175fdb085e8128ef Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Tue, 7 Feb 2017 14:08:22 +0100
Subject: Dockerise

---
 .gitignore          |  3 ++-
 conf.php            |  9 ---------
 db/install.sql      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml  | 31 +++++++++++++++++++++++++++++++
 frontend/.htaccess  |  1 +
 frontend/Dockerfile |  3 +++
 frontend/conf.php   |  9 +++++++++
 frontend/list.php   | 41 +++++++++++++++++++++++++++++++++++++++++
 list.php            | 41 -----------------------------------------
 9 files changed, 135 insertions(+), 51 deletions(-)
 delete mode 100644 conf.php
 create mode 100644 db/install.sql
 create mode 100644 docker-compose.yml
 create mode 100644 frontend/.htaccess
 create mode 100644 frontend/Dockerfile
 create mode 100644 frontend/conf.php
 create mode 100644 frontend/list.php
 delete mode 100644 list.php

diff --git a/.gitignore b/.gitignore
index f606d5e..c40bf5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-repo
+db/storage
+frontend/repo
diff --git a/conf.php b/conf.php
deleted file mode 100644
index 5765a11..0000000
--- a/conf.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-define('DB_HOST', 'localhost');
-define('DB_NAME', 'clpm');
-define('DB_USER', 'clpm');
-define('DB_PASS', 'password');
-
-$db = new mysqli(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-if (mysqli_connect_errno())
-	die('Connection to the database failed.');
diff --git a/db/install.sql b/db/install.sql
new file mode 100644
index 0000000..f58cf5b
--- /dev/null
+++ b/db/install.sql
@@ -0,0 +1,48 @@
+CREATE TABLE `author` (
+	`id` tinyint(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	`name` varchar(64) NOT NULL,
+	`email` varchar(256) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `job` (
+	`id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	`package_id` smallint(5) UNSIGNED NOT NULL,
+	`major` tinyint(3) UNSIGNED NOT NULL,
+	`minor` tinyint(3) UNSIGNED NOT NULL,
+	`revision` tinyint(3) UNSIGNED NOT NULL,
+	`time_scheduled` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`time_started` datetime DEFAULT NULL,
+	`time_finished` datetime DEFAULT NULL,
+	`result_code` tinyint(3) UNSIGNED DEFAULT NULL,
+	`log` text
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `package` (
+	`id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	`author_id` tinyint(3) UNSIGNED NOT NULL,
+	`name` varchar(63) NOT NULL,
+	`url` varchar(2047) NOT NULL,
+	`desc` text NOT NULL,
+	`time_added` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `version` (
+	`id` mediumint(9) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	`package_id` smallint(5) UNSIGNED NOT NULL,
+	`major` tinyint(3) UNSIGNED NOT NULL,
+	`minor` tinyint(3) UNSIGNED NOT NULL,
+	`revision` tinyint(3) UNSIGNED NOT NULL,
+	`time_added` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`depends` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `author`
+	ADD PRIMARY KEY (`id`),
+	ADD UNIQUE KEY `name` (`name`);
+
+ALTER TABLE `package`
+	ADD UNIQUE KEY `name` (`name`),
+	ADD FULLTEXT KEY `description` (`desc`);
+
+ALTER TABLE `version`
+	ADD KEY `package` (`package_id`);
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..b9a2a86
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+  db:
+    image: mysql:latest
+    volumes:
+      - "./db/:/docker-entrypoint-initdb.d/"
+      - "./db/storage/:/var/lib/mysql/"
+    environment:
+        MYSQL_ROOT_PASSWORD: clpm
+        MYSQL_DATABASE: clpmdb
+        MYSQL_USER: clpm
+        MYSQL_PASSWORD: clpm
+    restart: always
+
+  frontend:
+    build: frontend
+    depends_on:
+      - db
+    ports:
+      - "80:80"
+    volumes:
+      - "./frontend/:/var/www/html/"
+    restart: always
+
+#  buildslave:
+#    build: buildslave
+#    depends_on:
+#      - db
+#    volumes:
+#      - "./frontend/repo:/repo"
+#    restart: always
diff --git a/frontend/.htaccess b/frontend/.htaccess
new file mode 100644
index 0000000..e1d2560
--- /dev/null
+++ b/frontend/.htaccess
@@ -0,0 +1 @@
+Options +Indexes
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..e9e468b
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,3 @@
+FROM php:apache
+
+RUN docker-php-ext-install mysqli
diff --git a/frontend/conf.php b/frontend/conf.php
new file mode 100644
index 0000000..f47a7cb
--- /dev/null
+++ b/frontend/conf.php
@@ -0,0 +1,9 @@
+<?php
+define('DB_HOST', 'db');
+define('DB_NAME', 'clpmdb');
+define('DB_USER', 'clpm');
+define('DB_PASS', 'clpm');
+
+$db = new mysqli(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+if (mysqli_connect_errno())
+	die('Connection to the database failed.');
diff --git a/frontend/list.php b/frontend/list.php
new file mode 100644
index 0000000..24340a8
--- /dev/null
+++ b/frontend/list.php
@@ -0,0 +1,41 @@
+<?php
+require_once('conf.php');
+
+$repo = [];
+
+$stmt = $db->prepare(
+	'SELECT `package`.`id`,`package`.`name`,`url`,`desc`,`author`.`name` ' .
+	'FROM `package`,`author` ' .
+	'WHERE `package`.`author_id` = `author`.`id`');
+$stmt->execute();
+$stmt->bind_result($id, $name, $url, $desc, $author);
+while ($stmt->fetch() === true) {
+	$repo[] = [
+		'id' => $id,
+		'name' => $name,
+		'author' => $author,
+		'desc' => $desc,
+		'url' => $url,
+		'versions' => []
+	];
+}
+$stmt->close();
+
+$stmt = $db->prepare(
+	'SELECT `major`,`minor`,`revision`,`depends` ' .
+	'FROM `version` WHERE `package_id`=?');
+$stmt->bind_param('i', $pkg);
+$stmt->bind_result($maj, $min, $rev, $deps);
+for ($i = 0; $i < count($repo); $i++) {
+	$pkg = $repo[$i]['id'];
+	$stmt->execute();
+	while ($stmt->fetch() === true) {
+		$repo[$i]['versions'][] = [
+			'version' => [$maj, $min, $rev],
+			'depends' => json_decode($deps)
+		];
+	}
+	unset($repo[$i]['id']);
+}
+
+print(json_encode($repo));
diff --git a/list.php b/list.php
deleted file mode 100644
index 24340a8..0000000
--- a/list.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once('conf.php');
-
-$repo = [];
-
-$stmt = $db->prepare(
-	'SELECT `package`.`id`,`package`.`name`,`url`,`desc`,`author`.`name` ' .
-	'FROM `package`,`author` ' .
-	'WHERE `package`.`author_id` = `author`.`id`');
-$stmt->execute();
-$stmt->bind_result($id, $name, $url, $desc, $author);
-while ($stmt->fetch() === true) {
-	$repo[] = [
-		'id' => $id,
-		'name' => $name,
-		'author' => $author,
-		'desc' => $desc,
-		'url' => $url,
-		'versions' => []
-	];
-}
-$stmt->close();
-
-$stmt = $db->prepare(
-	'SELECT `major`,`minor`,`revision`,`depends` ' .
-	'FROM `version` WHERE `package_id`=?');
-$stmt->bind_param('i', $pkg);
-$stmt->bind_result($maj, $min, $rev, $deps);
-for ($i = 0; $i < count($repo); $i++) {
-	$pkg = $repo[$i]['id'];
-	$stmt->execute();
-	while ($stmt->fetch() === true) {
-		$repo[$i]['versions'][] = [
-			'version' => [$maj, $min, $rev],
-			'depends' => json_decode($deps)
-		];
-	}
-	unset($repo[$i]['id']);
-}
-
-print(json_encode($repo));
-- 
cgit v1.2.3