Compare commits
No commits in common. "master" and "cleanup" have entirely different histories.
|
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.3.36-fpm AS php
|
FROM php:8.3.11-fpm AS php
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN ls /app
|
RUN ls /app
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,7 @@ steps:
|
||||||
- composer install --ignore-platform-reqs --no-dev
|
- composer install --ignore-platform-reqs --no-dev
|
||||||
|
|
||||||
- name: compress
|
- name: compress
|
||||||
image: php:8.3.36
|
image: php:8.1.6
|
||||||
commands:
|
commands:
|
||||||
- apt-get update -yqq
|
- apt-get update -yqq
|
||||||
- apt-get install -yqq zip tar
|
- apt-get install -yqq zip tar
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,5 @@
|
||||||
# Letzte Änderungen
|
# Letzte Änderungen
|
||||||
|
|
||||||
### 1.12.29
|
|
||||||
|
|
||||||
- Veranstaltungen können nun "bereinigt", sprich alle TN gelöscht werden
|
|
||||||
|
|
||||||
### 1.12.27
|
### 1.12.27
|
||||||
|
|
||||||
- Bei Rechnungs-und Erinnerungsmails wird nun der Stammesname angezeigt. Zudm kann eine ReplyTo gesetzt werden, wenn gewünscht
|
- Bei Rechnungs-und Erinnerungsmails wird nun der Stammesname angezeigt. Zudm kann eine ReplyTo gesetzt werden, wenn gewünscht
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg@adrema.dpsg-koeln.de']])
|
@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
|
||||||
|
|
||||||
@task('deploy', ['on' => 'docker'])
|
@task('deploy', ['on' => 'docker'])
|
||||||
cd $ADREMA_PATH
|
cd $ADREMA_PATH
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ abstract class ConnectionType extends Data
|
||||||
{
|
{
|
||||||
$filesystem = $this->getFilesystem();
|
$filesystem = $this->getFilesystem();
|
||||||
|
|
||||||
return collect($filesystem->directories($parent ?: '/'))->sort()->values()->toArray();
|
return $filesystem->directories($parent ?: '/');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ services:
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 5
|
retries: 5
|
||||||
volumes:
|
volumes:
|
||||||
|
- ./oc_tmp/files:/mnt/data
|
||||||
- ./08-skeleton.sh:/etc/entrypoint.d/08-skeleton.sh
|
- ./08-skeleton.sh:/etc/entrypoint.d/08-skeleton.sh
|
||||||
|
|
||||||
mariadb:
|
mariadb:
|
||||||
|
|
@ -43,6 +44,8 @@ services:
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
volumes:
|
||||||
|
- ./oc_tmp/db:/var/lib/mysql
|
||||||
|
|
||||||
nextclouddb:
|
nextclouddb:
|
||||||
image: mariadb:10.6
|
image: mariadb:10.6
|
||||||
|
|
@ -52,6 +55,8 @@ services:
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
volumes:
|
||||||
|
- ./oc_tmp/ncdb:/var/lib/mysql
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=secret
|
- MYSQL_ROOT_PASSWORD=secret
|
||||||
- MYSQL_PASSWORD=secret
|
- MYSQL_PASSWORD=secret
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue