move website into docker container

This commit is contained in:
Jonas Leder 2020-12-28 22:36:25 +01:00
parent b2c826b310
commit 38e782633a
90 changed files with 59 additions and 75 deletions

2
.gitignore vendored
View file

@ -1,2 +1,2 @@
internal/config.php
public/internal/config.php
.idea/

13
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,13 @@
docker-build-master:
# Official docker image.
image: docker:latest
stage: build
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
script:
- sudo docker build -t gitlab.jonasled.de/jonasled/website .
- docker push "gitlab.jonasled.de/jonasled/website"
only:
- master

View file

@ -1,72 +0,0 @@
<?php
include "../internal/mysql.php";
?>
<!DOCTYPE html>
<html lang="de">
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Website Cloner - Jonas Leder</title>
<link href="/css/style.css" rel="stylesheet">
<link href="/css/normalize.css" rel="stylesheet">
<link href="/css/sourcesanspro.css" rel="stylesheet">
<link href="/css/menue.css" rel="stylesheet">
<script src="https://kit.fontawesome.com/038c6c1f0e.js" crossorigin="anonymous"></script>
<!-- Matomo -->
<script type="text/javascript">
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setCookieDomain", "*.jonasled.de"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//matomo.jonasled.de/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//matomo.jonasled.de/matomo.php?idsite=1&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Matomo Code -->
</head>
<body>
<header>
<div class="header-wrapper">
<div class="header-homepage color-overlay" data-parallax-depth="20">
<div class="header-description gridContainer content-on-center">
<div class="row header-description-row">
<div class="header-content header-content-centered">
<div class="align-holder">
<h1 class="heading8">Website Cloner</h1>
<p class="header-subtitle"> </p>
<div class="header-buttons-wrapper"></div>
</div>
</div>
</div>
</div>
</div>
<div class="header-separator header-separator-bottom ">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 100" preserveAspectRatio="none">
<path class="svg-white-bg" d="M737.9,94.7L0,0v100h1000V0L737.9,94.7z"></path>
</svg>
</div>
</div>
<div id="mainMenu" includeHTML="/include/menue.php?page=projekte"></div>
</header>
<div id="content">
<p>
</p>
</div>
<footer includeHTML="/include/footer.php">
</footer>
<script src="/js/includeHTML.js"></script>
</body>
</html>

33
Dockerfile Normal file
View file

@ -0,0 +1,33 @@
ARG INSTALL_CRON=1
ARG INSTALL_COMPOSER=1
ARG PHP_VERSION
ARG GLOBAL_VERSION
FROM thecodingmachine/php:8.0-v4-slim-apache
# |--------------------------------------------------------------------------
# | Main PHP extensions
# |--------------------------------------------------------------------------
# |
# | Installs the main PHP extensions
# |
USER root
RUN cd /usr/local/lib/thecodingmachine-php/extensions/current/ && ./install_all.sh && ./disable_all.sh
USER docker
# |--------------------------------------------------------------------------
# | Default PHP extensions to be enabled (in addition to the one declared in Slim build)
# |--------------------------------------------------------------------------
ENV PHP_EXTENSION_APCU=1 \
PHP_EXTENSION_MYSQLI=1 \
PHP_EXTENSION_PDO_MYSQL=1 \
PHP_EXTENSION_IGBINARY=1 \
PHP_EXTENSION_REDIS=1 \
PHP_EXTENSION_SOAP=1
# |--------------------------------------------------------------------------
# | Add php files of website
# |--------------------------------------------------------------------------
COPY ./public /var/www/html
#RUN rm /var/www/html/internal/config.php

10
apache.conf Normal file
View file

@ -0,0 +1,10 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/public
<Directory /var/www>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
</VirtualHost>

View file

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 706 B

View file

Before

Width:  |  Height:  |  Size: 827 KiB

After

Width:  |  Height:  |  Size: 827 KiB

View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View file

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View file

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 187 KiB

View file

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB

View file

Before

Width:  |  Height:  |  Size: 253 KiB

After

Width:  |  Height:  |  Size: 253 KiB

View file

Before

Width:  |  Height:  |  Size: 1,005 KiB

After

Width:  |  Height:  |  Size: 1,005 KiB

View file

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

View file

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

View file

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View file

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 735 KiB

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 939 KiB

After

Width:  |  Height:  |  Size: 939 KiB

View file

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

View file

Before

Width:  |  Height:  |  Size: 675 KiB

After

Width:  |  Height:  |  Size: 675 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

View file

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

View file

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 188 KiB

View file

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 243 KiB

View file

@ -4,7 +4,7 @@ include "menue.php";
function getHeader($pagetitle, $navselect)
{
$menu = getMenu($navselect);
echo( <<<EOF
echo(<<<EOF
<!DOCTYPE html >
<html lang = "de" >
<html >

View file

@ -4,7 +4,7 @@ include "internal/footer.php";
getHeader("NTP Status", "status");
?>
<link href="css/ntp.css" rel="stylesheet">
<link href="data/css/ntp.css" rel="stylesheet">
<p>Da ich selber viel auf NTP zur Zeitsynchronisation setze habe ich mich dazu entschlossen selber einen NTP Server, welche im ntp pool gelistet ist aufzusetzen. Unten sind die Statistiken zum Server für IPv4 und für IPv6</p>
<a href="https://www.ntppool.org/scores/185.216.212.128">
<div data-server-ip="185.216.212.128" class="graph"></div>