added debug info and docker compose

This commit is contained in:
Chris
2025-05-17 18:15:09 +02:00
parent 5c6b17bcca
commit 419f5a19d1
5 changed files with 97 additions and 5 deletions

View File

@@ -1,7 +1,8 @@
tmp/*
inc/config.inc.php
src/inc/config.inc.php
data/*
lib/vendor
bin
logs/*
tmp/*
src/lib/vendor
.git
.github
.github
.vscode

38
docker-compose-dev.yml Normal file
View File

@@ -0,0 +1,38 @@
version: '3.9'
services:
pictshare:
build:
context: .
dockerfile: docker/Dockerfile
environment:
- SERVER_NAME=:80
- URL=http://localhost:8080/
- ALLOWED_SUBNET=
- CONTENTCONTROLLERS=
- MASTER_DELETE_CODE=
- MASTER_DELETE_IP=
- UPLOAD_FORM_LOCATION=
- UPLOAD_CODE=
- ALLOW_BLOATING=
- JPEG_COMPRESSION=
- PNG_COMPRESSION=
- ALT_FOLDER=
- S3_BUCKET=
- S3_ACCESS_KEY=
- S3_SECRET_KEY=
- S3_ENDPOINT=
- S3_REGION=
- FTP_SERVER=
- FTP_PORT=
- FTP_USER=
- FTP_PASS=
- FTP_PASSIVEMODE=
- FTP_SSL=
- FTP_BASEDIR=
- ENCRYPTION_KEY=
- ALWAYS_WEBP=
ports:
- 8080:80
volumes:
- ./data:/app/public/data
- ./logs:/app/public/logs

36
docker-compose.yml Normal file
View File

@@ -0,0 +1,36 @@
version: '3.9'
services:
pictshare:
image: 'HaschekSolutions/pictshare:3'
environment:
- SERVER_NAME=:80
- URL=http://localhost:8080/
- ALLOWED_SUBNET=
- CONTENTCONTROLLERS=
- MASTER_DELETE_CODE=
- MASTER_DELETE_IP=
- UPLOAD_FORM_LOCATION=
- UPLOAD_CODE=
- ALLOW_BLOATING=
- JPEG_COMPRESSION=
- PNG_COMPRESSION=
- ALT_FOLDER=
- S3_BUCKET=
- S3_ACCESS_KEY=
- S3_SECRET_KEY=
- S3_ENDPOINT=
- S3_REGION=
- FTP_SERVER=
- FTP_PORT=
- FTP_USER=
- FTP_PASS=
- FTP_PASSIVEMODE=
- FTP_SSL=
- FTP_BASEDIR=
- ENCRYPTION_KEY=
- ALWAYS_WEBP=
ports:
- 8080:80
volumes:
- ./data:/app/public/data
- ./logs:/app/public/logs

View File

@@ -8,6 +8,7 @@ WORKDIR /app/public
# Add php.ini
ADD configs/php.ini /usr/local/etc/php/php.ini
# Prepare app tree
ADD . /app/public/.
ADD docker/rootfs/start.sh /etc/start.sh

View File

@@ -20,10 +20,26 @@ class API
'upload' => $this->upload(),
'delete' => $this->delete(),
'info' => $this->info(),
'debug' => $this->debug(),
default => array('status' => 'err', 'reason' => 'Unknown API call', 'hint' => 'Check https://github.com/HaschekSolutions/pictshare/blob/master/rtfm/API.md for more information'),
};
}
public function debug(){
$data = array(
'server_name' => $_SERVER['SERVER_NAME'],
'server_addr' => $_SERVER['SERVER_ADDR'],
'remote_addr' => $_SERVER['REMOTE_ADDR'],
'remote_port' => $_SERVER['REMOTE_PORT'],
'HTTP_CF_CONNECTING_IP' => $_SERVER['HTTP_CF_CONNECTING_IP'],
'HTTP_CLIENT_IP' => $_SERVER['HTTP_CLIENT_IP'],
'HTTP_X_FORWARDED_FOR' => $_SERVER['HTTP_X_FORWARDED_FOR'],
);
return $data;
}
public function upload()
{
try {