diff --git a/conf/admin-conf.json b/conf/admin-conf.json deleted file mode 100644 index 08e64e7..0000000 --- a/conf/admin-conf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "title": "Script server", - "port": "5000", - "access": { - "admin_users": [ "*" ] - } -} diff --git a/data-conf/conf.json b/data-conf/conf.json new file mode 100644 index 0000000..ecd6225 --- /dev/null +++ b/data-conf/conf.json @@ -0,0 +1,10 @@ +{ + "title": "Script Server", + "access": { + "admin_users": [ "*" ] + }, + "logging": { + "execution_file": "$DATE-$ID.log", + "execution_date_format": "%y-%m-%d_%H-%M" + } + } \ No newline at end of file diff --git a/conf/logging.json b/data-conf/logging.json similarity index 100% rename from conf/logging.json rename to data-conf/logging.json diff --git a/conf/runners/.gitkeep b/data-logs/.gitkeep similarity index 100% rename from conf/runners/.gitkeep rename to data-logs/.gitkeep diff --git a/conf/scripts/.gitkeep b/data-scripts/.gitkeep similarity index 100% rename from conf/scripts/.gitkeep rename to data-scripts/.gitkeep diff --git a/docker-compose.yaml b/docker-compose.yaml index 3117ae5..2db2bfe 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,12 +2,11 @@ services: script-server: restart: unless-stopped environment: - - TZ=Europe/Kyiv - ports: - - 5000:5000 + - PYTHONUNBUFFERED=1 volumes: - - ./app/conf.json:/app/conf/conf.json - - ./app/runners:/app/conf/runners - - ./app/scripts:/app/conf/scripts + - /var/run/docker.sock:/var/run/docker.sock + - ./data-conf:/app/conf + - ./data-scripts:/app/scripts + - ./data-logs:/app/logs image: gitea.stuzer.link/stuzer05/docker-script-server:latest - container_name: script-server + container_name: script-server \ No newline at end of file