Skip to content
This repository has been archived by the owner on Mar 17, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ph-ash/documentation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.0
Choose a base ref
...
head repository: ph-ash/documentation
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
9 changes: 9 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.dockerignore
.env.local
.env.*.local
.git*
.idea
.travis.yml
Dockerfile
/docker/runTests.sh
mongodata/
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
.idea
/mongodata/
/screenshots/
/vendor/
43 changes: 43 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
dist: xenial

language: php

php:
- '7.2'

services:
- docker

branches:
only:
- master

notifications:
slack:
rooms:
- phash:ZWTgdQdQ9fSlC9nJ3TUY2gjv
on_success: change
on_failure: always

script:
- mkdir screenshots
- rm -fr .git/
- git clone https://github.com/ph-ash/server.git server
- cd server
- docker build . -t phashserver
- cd ../
- git clone https://github.com/ph-ash/board.git board
- cd board
- docker build . -t phashboard
- cd ../
- git clone https://github.com/ph-ash/nginx.git nginx
- cd nginx
- docker build . -t phashnginx
- cd ../
- docker build . -t phashtests
- SCENARIO= docker-compose -f docker-compose.yaml -f docker-compose.test.yaml pull mongo chrome
- composer install --ignore-platform-reqs
- composer dump-autoload --optimize
- docker/runTests.sh
- cd screenshots
- find . -name "*.png" -exec bash -c 'curl -s -F "file=@{}" https://file.io | jq .link | tr -d "\""' \;
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## v2.1.0

* add version information
* add regression tests for the application
* fix delayed redrawing of idle monitorings

## v2.0.2

* fix to reject pushes into leafs
* fix resetting priority of grown tiles
* optimize update delay from API call to board push

## v2.0.1

* fix broken server docker image
* fix board update when bulk pushing
* optimized docker images build time and image size

## v2.0.0

* add detail view for monitorings
27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM composer:1 as composer
COPY . /var/www/html
WORKDIR /var/www/html
ENV APP_ENV=prod

RUN composer install --ignore-platform-reqs \
&& composer dump-autoload --optimize

# next stage #

FROM docker/compose:1.26.2
COPY --from=composer /var/www/html /var/www/html
WORKDIR /var/www/html
ENV APP_ENV=prod

RUN apk add --no-cache php7-cli \
php7-ctype \
php7-curl \
php7-dom \
php7-iconv \
php7-json \
php7-mbstring \
php7-openssl \
php7-session \
php7-tokenizer

ENTRYPOINT ["docker/entrypoint.sh"]
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Archive notice

## The development team around [ph-ash](https://github.com/ph-ash) has stopped working on the project for over a year, and is not going to continue working on it anymore. The repositories will stay as public archives for some time, but in the long run, the organization is going to be deleted. Feel free to fork and copy whatever you like from the repositories.

# Phash documentation

PHP monitoring dashboard documentation
@@ -54,7 +58,7 @@ The data is persisted in a subfolder `mongodata` of the folder where you placed

## Installation

You can simply download the [docker-compose.yaml](https://raw.githubusercontent.com/ph-ash/documentation/v2.0.0/docker-compose.yaml) and run
You can simply download the [docker-compose.yaml](https://raw.githubusercontent.com/ph-ash/documentation/v2.1.0/docker-compose.yaml) and run

docker-compose up -d

21 changes: 21 additions & 0 deletions behat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
default:
suites:
default:
paths:
- /var/www/html/features
contexts:
- Tests\Context\FeatureContext: ~
- Tests\Context\DashboardContext: ~
- Tests\Context\APIContext: ~
- Behat\MinkExtension\Context\MinkContext: ~
list: ~
extensions:
Liuggio\Fastest\Behat\ListFeaturesExtension\Extension: ~
DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
Behat\MinkExtension:
browser_name: chrome
base_url: http://nginx
sessions:
default:
chrome:
validate_certificate: false
25 changes: 25 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"type": "project",
"license": "proprietary",
"require": {
"php": "^7.2.11",
"ext-json": "*"
},
"require-dev": {
"behat/behat": "^3.5",
"dmore/behat-chrome-extension": "^1.2",
"kriswallsmith/buzz": "^1.0",
"liuggio/fastest": "^1.6",
"nyholm/psr7": "^1.1",
"roave/security-advisories": "dev-master",
"symfony/process": "^4.2",
"symfony/property-access": "^4.2",
"webmozart/assert": "^1.4"
},
"config": {
"preferred-install": {
"*": "dist"
},
"sort-packages": true
}
}
Loading