Skip to content

Commit e7e86b3

Browse files
authored
Merge pull request #41 from wurstbrot/feat/folderRestructure
WIP: Restructure yamls
2 parents 1d54d34 + 674227b commit e7e86b3

15 files changed

Lines changed: 454 additions & 1880 deletions

Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1+
FROM composer AS vendor
2+
COPY composer.json composer.json
3+
COPY composer.lock composer.lock
4+
RUN composer install \
5+
--ignore-platform-reqs \
6+
--no-interaction \
7+
--no-plugins \
8+
--no-scripts \
9+
--prefer-dist
10+
111
FROM php:7.2-apache
2-
RUN apt-get update && apt-get -y install apt-utils nano libyaml-dev
12+
RUN apt-get update && apt-get -y install apt-utils libyaml-dev
313
RUN docker-php-ext-install gettext
414
RUN pecl channel-update pecl.php.net && pecl install yaml-2.0.0 && docker-php-ext-enable yaml
515
RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
616
COPY . /var/www/html/
17+
COPY --from=vendor /app/vendor/ /var/www/html/vendor/
18+

bib.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2-
error_reporting(E_ERROR);
3-
define(NUMBER_LEVELS, 4);
4-
define(IS_SHOW_EVIDENCE_TODO, false);
2+
require __DIR__ . '/vendor/autoload.php';
3+
ini_set('display_errors', 1);
4+
ini_set('display_startup_errors', 1);
5+
error_reporting(E_ALL);
6+
define('NUMBER_LEVELS', 4);
7+
define('IS_SHOW_EVIDENCE_TODO', false);
58

6-
include_once "bib/parsedown/Parsedown.php";
79
function readCSV($filename, $delimiter)
810
{
911
if (!file_exists($filename) || !is_readable($filename))

bib/parsedown/LICENSE.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)