From 1d9deebd584ee86901424596e1e82b95af1e5047 Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 13 Oct 2024 17:45:01 +0200 Subject: [PATCH] wip --- homepage/cwsvJudo/participo/PHP.dockerfile | 8 +++++++- .../participo/cwsvjudo@bplaced/www/mysql.php | 15 --------------- homepage/cwsvJudo/participo/docker-compose.yml | 18 +++++++++++++----- homepage/cwsvJudo/participo/nginx.conf | 3 ++- homepage/cwsvJudo/participo/traineetable.md | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 22 deletions(-) delete mode 100644 homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php create mode 100644 homepage/cwsvJudo/participo/traineetable.md diff --git a/homepage/cwsvJudo/participo/PHP.dockerfile b/homepage/cwsvJudo/participo/PHP.dockerfile index e4efb2c..49da2a7 100644 --- a/homepage/cwsvJudo/participo/PHP.dockerfile +++ b/homepage/cwsvJudo/participo/PHP.dockerfile @@ -8,4 +8,10 @@ RUN docker-php-ext-install pdo pdo_mysql # install and add xdebug extension # @todo What is pecl? # @todo What is xdebug and how do I use it? -RUN pecl install xdebug && docker-php-ext-enable xdebug \ No newline at end of file +RUN pecl install xdebug && docker-php-ext-enable xdebug + +RUN ls /home/ -lah +ADD ./cwsvjudo@bplaced/www/participo /home/cwsvjudo/httpdocs/participo/lastLogins.json +RUN chown -R www-data:www-data /home/cwsvjudo/httpdocs/participo/lastLogins.json + +RUN ls -lah /home/cwsvjudo/httpdocs/participo/ diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php deleted file mode 100644 index 5b224c7..0000000 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php +++ /dev/null @@ -1,15 +0,0 @@ - PDO::ERRMODE_EXCEPTION] -); - -$query = $pdo->query('SHOW VARIABLES like "version"'); - -$row = $query->fetch(); - -echo 'MYSQL version: '. $row['Value']; diff --git a/homepage/cwsvJudo/participo/docker-compose.yml b/homepage/cwsvJudo/participo/docker-compose.yml index 66695eb..df237fb 100644 --- a/homepage/cwsvJudo/participo/docker-compose.yml +++ b/homepage/cwsvJudo/participo/docker-compose.yml @@ -12,10 +12,16 @@ services: - "80:80" # files and directories to be available in the container # - localPath:pathInContainer - volumes: + volumes: + # nginx config file - ./nginx.conf:/etc/nginx/conf.d/nginx.conf - # - ./app:/app - - ./cwsvjudo@bplaced/:/users/cwsvjudo + # the app itself + - ./cwsvjudo@bplaced/www/participo:/home/cwsvjudo/httpdocs/participo + # the apps config files + - ./config-heliohost/cwsvJudo.config.php:/home/cwsvjudo/.local/cwsvJudo.config.php + # ressourcen + - /home/marko/cwsvJudo/submodules/materialize/dist:/home/cwsvjudo/httpdocs/ressourcen/materializeCss + - /home/marko/cwsvJudo/homepage/cwsvJudo/build/graphiken:/home/cwsvjudo/httpdocs/ressourcen/graphiken # php and extensions php: # use pre-build image from docker.. @@ -27,8 +33,10 @@ services: # files and directories to be available in the container # @todo Except from better structuring: Is there a reason for not having the volumes as one central list? volumes: - - ./cwsvjudo@bplaced:/users/cwsvjudo/ - # install a dm + # the app itself + - ./cwsvjudo@bplaced/www/participo:/home/cwsvjudo/httpdocs/participo + # the apps config files + - ./config-heliohost/cwsvJudo.config.php:/home/cwsvjudo/.local/cwsvJudo.config.php # @todo Maybe use postgre instead? database: image: mariadb:latest diff --git a/homepage/cwsvJudo/participo/nginx.conf b/homepage/cwsvJudo/participo/nginx.conf index 62c9125..e62099e 100644 --- a/homepage/cwsvJudo/participo/nginx.conf +++ b/homepage/cwsvJudo/participo/nginx.conf @@ -1,7 +1,8 @@ # @todo Needs helpfull comments. server { listen 80 default_server; - root /users/cwsvjudo/www; + # root /users/cwsvjudo/www; + root /home/cwsvjudo/httpdocs; index index.php index.html index.htm; diff --git a/homepage/cwsvJudo/participo/traineetable.md b/homepage/cwsvJudo/participo/traineetable.md new file mode 100644 index 0000000..07b58d5 --- /dev/null +++ b/homepage/cwsvJudo/participo/traineetable.md @@ -0,0 +1,16 @@ +# Planung Kyu-Prüfung 2024-2 + +| Name | Vorname | AK | Kyu | 2xKyu | +| :---------- | :-------- | :---: | :---: | :---: | +| Weidensager | Nick | M | (X) | - | +| Dumler | Arthur | U18 | (X) | - | +| Richter | Friedrich | U17 | X | X | +| Brittnacher | Romy | U14 | (X) | - | +| Richter | August | U13 | X | X | +| Eberlein | Benedikt | U12 | X | X | +| Kutschmann | Leonhard | U12 | X | X | +| Bondar | David | U12 | X | X | +| Ortmans | Leonie | U11 | (X) | - | +| Maiatska | Mariia | U10 | (X) | - | +| Eberlein | Johanna | U10 | X | - | +| Gerlach | Mara | U9 | (X) | - |