mirror of
https://github.com/cytopia/devilbox.git
synced 2024-12-18 20:37:55 +00:00
DVL-016 clean-up after gh-pages branch
This commit is contained in:
cytopia
parent
0cb044e39d
commit
a8c1513bb7
6
.gitignore
vendored
6
.gitignore
vendored
@ -39,12 +39,6 @@
|
||||
/cfg/php-fpm-7.1/*.ini
|
||||
/cfg/hhvm-latest/*.ini
|
||||
|
||||
# gh-pages
|
||||
docs/Gemfile
|
||||
docs/Gemfile.lock
|
||||
docs/_site/
|
||||
docs/view-page.sh
|
||||
|
||||
|
||||
######################################
|
||||
# GENERIC
|
||||
|
||||
@ -340,8 +340,8 @@ devilbox_start() {
|
||||
done
|
||||
printf "\n"
|
||||
|
||||
# Wait another 30 sec for databases to come up
|
||||
wait_for 30 1
|
||||
# Wait another 60 sec for databases to come up
|
||||
wait_for 60 1
|
||||
echo
|
||||
|
||||
}
|
||||
@ -436,7 +436,7 @@ devilbox_test_url() {
|
||||
_pattern="${2}"
|
||||
_number="${3}"
|
||||
|
||||
_count="$( curl -q "${_url}" 2>/dev/null | grep -c "${_pattern}" || true )"
|
||||
_count="$( curl -q --retry 100 --retry-max-time 0 "${_url}" 2>/dev/null | grep -c "${_pattern}" || true )"
|
||||
|
||||
if [ "${_count}" != "${_number}" ]; then
|
||||
echo "[ERR]: Found ${_count}/${_number} of '${_pattern}'"
|
||||
|
||||
@ -172,10 +172,10 @@ matrix:
|
||||
###
|
||||
before_install:
|
||||
# Get newer docker version
|
||||
- max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
|
||||
- max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine; then break; else i=$((i+1)); fi done
|
||||
- max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
|
||||
- max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine; then break; else i=$((i+1)); fi done
|
||||
# Get newer docker-compose version
|
||||
- curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||
- curl -L --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||
- chmod +x docker-compose
|
||||
- sudo mv -f docker-compose /usr/local/bin
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
devilbox.org
|
||||
@ -1,2 +0,0 @@
|
||||
theme: jekyll-theme-slate
|
||||
google_analytics: UA-51797082-4
|
||||
@ -1,62 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ site.lang | default: "en-US" }}">
|
||||
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||
<meta name="viewport" content="width=device-width,maximum-scale=2">
|
||||
<meta name="description" content="{{ site.title | default: site.github.repository_name }} : {{ site.description | default: site.github.project_tagline }}">
|
||||
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
|
||||
|
||||
<title>{{ site.title | default: site.github.repository_name }}</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<!-- HEADER -->
|
||||
<div id="header_wrap" class="outer">
|
||||
<header class="inner">
|
||||
<a id="forkme_banner" href="{{ site.github.repository_url }}">View on GitHub</a>
|
||||
|
||||
<h1 id="project_title">{{ site.title | default: site.github.repository_name }}</h1>
|
||||
<h2 id="project_tagline">{{ site.description | default: site.github.project_tagline }}</h2>
|
||||
|
||||
{% if site.show_downloads %}
|
||||
<section id="downloads">
|
||||
<a class="zip_download_link" href="{{ site.github.zip_url }}">Download this project as a .zip file</a>
|
||||
<a class="tar_download_link" href="{{ site.github.tar_url }}">Download this project as a tar.gz file</a>
|
||||
</section>
|
||||
{% endif %}
|
||||
</header>
|
||||
</div>
|
||||
|
||||
<!-- MAIN CONTENT -->
|
||||
<div id="main_content_wrap" class="outer">
|
||||
<section id="main_content" class="inner">
|
||||
{{ content }}
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<!-- FOOTER -->
|
||||
<div id="footer_wrap" class="outer">
|
||||
<footer class="inner">
|
||||
{% if site.github.is_project_page %}
|
||||
<p class="copyright">{{ site.title | default: site.github.repository_name }} maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
|
||||
{% endif %}
|
||||
<p>Published with <a href="https://pages.github.com">GitHub Pages</a></p>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
{% if site.google_analytics %}
|
||||
<script type="text/javascript">
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
ga('create', '{{ site.google_analytics }}', 'auto');
|
||||
ga('send', 'pageview');
|
||||
</script>
|
||||
{% endif %}
|
||||
</body>
|
||||
</html>
|
||||
@ -1,46 +0,0 @@
|
||||
---
|
||||
---
|
||||
|
||||
@import "{{ site.theme }}";
|
||||
|
||||
.inner {
|
||||
max-width: 850px;
|
||||
position: relative;
|
||||
padding: 20px 10px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
#header_wrap {
|
||||
background-image: url('/assets/img/devilbox-dash.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
min-height: 100%;
|
||||
}
|
||||
h1, h2, h3 {
|
||||
text-align: center;
|
||||
}
|
||||
h2, h3 {
|
||||
margin-top:30px;
|
||||
}
|
||||
|
||||
|
||||
table {
|
||||
margin: auto;
|
||||
width: 50%;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
}
|
||||
img.battery {
|
||||
/*border: 1px solid black;*/
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
/* remove gh pages link */
|
||||
footer.inner p {
|
||||
display: none;
|
||||
}
|
||||
footer.inner p.copyright {
|
||||
display: block;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user