Commit 26155e55 authored by remy's avatar remy
Browse files

Merge branch 'develop' into 'master'

affichage

See merge request !1
parents 33da23ea 75451b48
......@@ -20,13 +20,15 @@ service apache2 restart
# Creating username and database
```bash
echo "CREATE DATABASE wicopa;" | mysql -u username -p
echo "CREATE DATABASE wicopa;" | mysql -uroot -p
echo 'GRANT ALL PRIVILEGES ON wicopa.* TO "wicopauser"@"localhost";' |mysql -u root -p
echo "CREATE USER 'wicopauser'@'localhost' IDENTIFIED BY 's3cret;'" | mysql -uroot -p
echo 'GRANT ALL PRIVILEGES ON wicopa.* TO "wicopauser"@"localhost";' | mysql -uroot -p
wget http://web.mbb.univ-montp2.fr/download/wicopa.sql.gz
pv wicopa.sql.gz | gunzip | mysql -u wicopauser -p wicopa
pv wicopa.sql.gz | gunzip | mysql -uwicopauser -p wicopa
vim conf/Conf.php
```
......
......@@ -67,5 +67,3 @@
.custom-checkbox .custom-control-input:focus ~ .custom-control-indicator {
box-shadow: none !important;
}
......@@ -143,7 +143,7 @@ function printPanel($name) {
</div>
<div class="card-body">
<div class="form-group">
<label for="imageNameInput" class="font-weight-bold">Image Name :</label>
<label for="imageNameInput" class="font-weight-bold">Image Name <span style="font-size:20px;" class="status text-danger">*</span>:</label>
<input type="text" class="form-control" id="imageNameInput">
</div>
......@@ -151,12 +151,12 @@ function printPanel($name) {
<label for="baseNameInput" class="font-weight-bold">From :</label>
<input type="text" class="form-control" id="baseNameInput">
<small id="help0" class="form-text text-muted">You can find images name on <a href="https://hub.docker.com/search?q=&type=image" >docker hub </a>.</small>
<small id="help1" class="form-text text-muted">If from is empty the from is chosen distribution. </small>
<small id="help1" class="form-text text-muted">If the above "From" field is empty, then <a href="https://docs.docker.com/engine/reference/builder/#from">"From"</a> is chosen from distribution bellow. </small>
<small id="help2" class="form-text text-muted">You must make sure that the OS of your base container is compatible with the chosen distribution. </small>
</div>
<div class="form-group">
<label for="selectedOS" class="font-weight-bold">Distribution :</label>
<label for="selectedOS" class="font-weight-bold">Distribution <span style="font-size:20px;" class="status text-danger">*</span>:</label>
<select class="custom-select" id="selectedOS" onchange="hide_os_rows()">
<?php
......@@ -463,4 +463,4 @@ function printPanel($name) {
</script>
</body>
</html>
\ No newline at end of file
</html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment