← Back to branch summary

~xibo-maintainers/xibo/release21

~xibo-maintainers/xibo/release21

Viewing all changes in revision 605.

Committer: GitHub
Author(s): Dan Garner
Date: 2018-01-21 11:06:43 UTC
mfrom: (602.3.13)
Revision ID: git-v1:7900a816ad2b730b23d7b671b5a572f3b87da65f

Merge pull request #304 from dasgarner/feature/tempel-dockerfile

PHP7 web container built from CMS repo

files added:
.dockerignore

Dockerfile

Dockerfile.dev

build.sh

docker

docker/entrypoint.sh

docker/etc

docker/etc/apache2

docker/etc/apache2/conf.d

docker/etc/apache2/conf.d/cms.conf

docker/etc/apache2/conf.d/mpm_prefork.conf

docker/etc/cron.d

docker/etc/cron.d/anacron

docker/etc/ssmtp

docker/etc/ssmtp/ssmtp.conf

docker/mod_xsendfile.c

docker/tmp

docker/tmp/settings-custom.php

docker/tmp/settings.php-template

docker/usr

docker/usr/local

docker/usr/local/bin

docker/usr/local/bin/httpd-foreground

docker/usr/local/bin/wait-for-command.sh

lib/Helper/Environment.php

files removed:
Vagrantfile

gulpfile.js

files modified:
.gitignore

README.md

composer.json

composer.lock

docker-compose.yml

lib/Controller/Base.php

lib/Controller/Campaign.php

lib/Controller/Display.php

lib/Controller/Settings.php

lib/Controller/Upgrade.php

lib/Entity/Campaign.php

lib/Entity/Command.php

lib/Entity/DataSet.php

lib/Entity/DayPart.php

lib/Entity/Display.php

lib/Entity/DisplayGroup.php

lib/Entity/DisplayProfile.php

lib/Entity/Help.php

lib/Entity/Media.php

lib/Entity/Module.php

lib/Entity/Resolution.php

lib/Entity/Schedule.php

lib/Entity/User.php

lib/Entity/UserGroup.php

lib/Factory/DataSetFactory.php

lib/Factory/UpgradeFactory.php

lib/Factory/UserFactory.php

lib/Helper/BlueImpUploadHandler.php

lib/Helper/ByteFormatter.php

lib/Helper/Session.php

lib/Helper/Translate.php

lib/Middleware/CsrfGuard.php

lib/Middleware/Storage.php

lib/Middleware/Theme.php

lib/Service/ConfigService.php

lib/Service/ConfigServiceInterface.php

lib/Service/PlayerActionService.php

lib/Widget/Clock.php

lib/Widget/DataSetView.php

lib/Widget/Image.php

lib/Widget/LocalVideo.php

lib/Widget/Ticker.php

lib/Widget/Twitter.php

lib/Widget/TwitterMetro.php

lib/Widget/VideoIn.php

lib/XTR/MaintenanceDailyTask.php

tests/LocalWebTestCase.php

web/xmds.php

Show diffs side-by-side

added added

removed removed

docker-compose.yml

docker/entrypoint.sh

docker/etc/apache2/

docker/etc/apache2/conf.d/

docker/etc/apache2/conf.d/cms.conf

docker/etc/apache2/conf.d/mpm_prefork.conf

docker/etc/cron.d/

docker/etc/cron.d/anacron

docker/etc/ssmtp/

docker/etc/ssmtp/ssmtp.conf

docker/mod_xsendfile.c

docker/tmp/settings-custom.php

docker/tmp/settings.php-template

docker/usr/local/

docker/usr/local/bin/

docker/usr/local/bin/httpd-foreground

docker/usr/local/bin/wait-for-command.sh

lib/Controller/Base.php

lib/Controller/Campaign.php

lib/Controller/Display.php

lib/Controller/Settings.php

lib/Controller/Upgrade.php

lib/Entity/Campaign.php

lib/Entity/Command.php

lib/Entity/DataSet.php

lib/Entity/DayPart.php

lib/Entity/Display.php

lib/Entity/DisplayGroup.php

lib/Entity/DisplayProfile.php

lib/Entity/Help.php

lib/Entity/Media.php

lib/Entity/Module.php

lib/Entity/Resolution.php

lib/Entity/Schedule.php

lib/Entity/User.php

lib/Entity/UserGroup.php

lib/Factory/DataSetFactory.php

lib/Factory/UpgradeFactory.php

lib/Factory/UserFactory.php

lib/Helper/BlueImpUploadHandler.php

lib/Helper/ByteFormatter.php

lib/Helper/Environment.php

lib/Helper/Session.php

lib/Helper/Translate.php

lib/Middleware/CsrfGuard.php

lib/Middleware/Storage.php

lib/Middleware/Theme.php

lib/Service/ConfigService.php

lib/Service/ConfigServiceInterface.php

lib/Service/PlayerActionService.php

lib/XTR/MaintenanceDailyTask.php

tests/LocalWebTestCase.php

Older »