2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-11-15 10:39:27 +01:00
Commit graph

46 commits

Author SHA1 Message Date
Philipp Holzer 7c19b91609
Upgrade VERSION
- delete 2018.05-rc (develop)
- add 2018.05 (stable/latest)
- add 2018.08-dev (develop)
2018-06-01 19:03:37 +02:00
Hypolite Petovan 2ab4b541a4
Merge pull request #14 from nupplaphil/bugfix_friendica_script
Bugfixing friendica script
2018-05-28 20:41:38 -04:00
Philipp Holzer 9400a02db9
fixed TAB for README 2018-05-28 21:25:18 +02:00
Philipp Holzer 9da471a4f7
Bugfixing friendica script
and added some README text
2018-05-28 21:22:41 +02:00
Hypolite Petovan 41f1cfbba2
Merge pull request #13 from nupplaphil/readmes
Adding READMEs
2018-05-26 13:18:07 -04:00
Philipp Holzer b0833d717a
Adding READMEs
- Adding `.examples/README.md`
- Adding `README-MAINTENANCE.md`
- Updating `README.md`
2018-05-26 19:13:10 +02:00
Philipp 4531090f51
Merge pull request #11 from nupplaphil/docker-compose_examples
Adding examples for docker-compose
2018-05-26 18:51:47 +02:00
Philipp Holzer b9ed3e8ce6
Update yml-file for play-with-docker 2018-05-26 18:19:57 +02:00
Philipp Holzer 3ad29a99ba
Enabling ACME for traefik 2018-05-26 17:49:37 +02:00
Philipp Holzer 9361e82fc7
Adding examples for docker-compose
- Added `.examples/docker-compose/insecure/mariadb-cron-smtp`
- Added `.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp`
- Updated README.md
2018-05-26 17:40:48 +02:00
Hypolite Petovan e604b821b7
Merge pull request #10 from nupplaphil/bugfix_friendica_htconfig
Bugfix of htconfig.php and friendica script
2018-05-26 08:58:12 -04:00
Philipp Holzer 965ffeecd1
forgot to update htconfig.php 2018-05-26 13:41:12 +02:00
Philipp Holzer ea387bf9e8
Bugfixings
- `.bin/friendica` copy bug
- `.config/htconfig.php` was not well prepared for MariaDB
2018-05-26 13:32:59 +02:00
Tobias Diekershoff 4c43c9037e
Merge pull request #9 from nupplaphil/update_and_maintenance
Change update & maintenance process
2018-05-25 20:35:21 +02:00
Philipp Holzer aea96cb91c
Bugfixings
- `.bin/friendica` - update didn't execute composer
- `.bin/friendica` - rsync deleted the `.htconfig.php`
- `.bin/friendica` - wrong "addon" version variable
2018-05-24 22:38:25 +02:00
Philipp Holzer b46fae9173
Change update & maintenance process
- Using 2018.05-rc as stable/productionin
- Using "update.sh" for creating the environments (single point of
change)
2018-05-24 21:20:25 +02:00
Hypolite Petovan 1e6852cd9a
Merge pull request #5 from nupplaphil/fix_cron
Fixing `cron.sh`
2018-05-22 16:02:02 -04:00
Philipp Holzer 392c896a4e
Fixing cron.sh 2018-05-22 21:47:37 +02:00
Hypolite Petovan c591457367
Merge pull request #4 from nupplaphil/friendica_server
Temporary change image name
2018-05-22 14:51:22 -04:00
Philipp Holzer ca12be111e
add friendica/server to README.md , travis & pwd 2018-05-22 20:15:36 +02:00
Philipp Holzer acc5cc55e8
Merge remote-tracking branch 'remotes/origin/master' into friendica_server
# Conflicts:
#	README.md
2018-05-22 20:12:03 +02:00
Philipp Holzer e92023d702
Temporary use of image "friendica/server" instead of "friendica"
Until https://github.com/docker-library/official-images/pull/4375 is merged.
2018-05-22 19:51:41 +02:00
Hypolite Petovan 65b3634e71
Merge pull request #3 from nupplaphil/docker-compose
Docker-Compose examples
2018-05-22 10:49:45 -04:00
Hypolite Petovan 2910c03994
Merge pull request #2 from nupplaphil/readme_pwd
README.md enhancements & PWD preperation
2018-05-22 10:48:49 -04:00
Philipp Holzer 6f5687f53b
Added docker-compose example for maraidb, cron and smtp with apache 2018-05-22 15:05:47 +02:00
Philipp Holzer 32a5a7a7d1
Unintended remove of a block. 2018-05-22 13:57:48 +02:00
Philipp Holzer f7c3915a5a
README.md enhancements & adding pwd.yml for later usage 2018-05-22 13:48:49 +02:00
Hypolite Petovan 9c954f4d6b
Merge pull request #1 from nupplaphil/repo-init
Docker Repository initialization
2018-05-21 16:08:15 -04:00
Philipp Holzer 1362cc34ca
Fixed cron.sh & update
- restored script `friendica` for update & wrapper purpose
- fixed `cron.sh`
2018-05-21 21:32:26 +02:00
Philipp Holzer ce49a5994b
Fixing travis tests
- Fixing output verbosity
2018-05-20 22:33:29 +02:00
Philipp Holzer 22a3d48c9f
Fixing update
- "exit 0" when explicit updating Friendica
2018-05-20 22:13:05 +02:00
Philipp Holzer f3b3fe5e39
Fixing travis tests
- Fixing `git clone` at develop-branch to pipe the output to /dev/null
2018-05-20 22:07:54 +02:00
Philipp Holzer eb7399e6f2
Fixing travis tests
- deleting `friendica` binary (not usable in docker environments)
- adding the business logic to `entrypoint.sh`
- quiet installation of Friendica (reason for Travis-fails!)
2018-05-20 21:55:54 +02:00
Philipp Holzer c8069b2d54
Added travis build-status to README 2018-05-20 20:16:22 +02:00
Philipp Holzer 532fa98ff6
README.md fix 2018-05-20 20:02:58 +02:00
Philipp Holzer 0f93be95e8
README.md fix 2018-05-20 20:02:01 +02:00
Philipp Holzer 3aebb1ac08
Replaced every "exit" in the friendica CLI with "return"
This should possibly fix the Travis.yml test
2018-05-20 16:54:57 +02:00
Philipp Holzer a6d069de07
Added documentation about Update & the friendica shell in README.md 2018-05-20 16:51:55 +02:00
Philipp Holzer 7e2bfa10c4
friendica cli improvement
`friendica update` now pulls the latest git changes of the develop-branch
2018-05-20 16:34:47 +02:00
Philipp Holzer 2125efd5f6
Bugfix SMTP Dockerfile for fpm-alpine
- Typo & forgot ENV variable
2018-05-20 16:18:55 +02:00
Philipp Holzer 0826aaefa9
Improvements and Examples
- Adding `sendmail` feature to `apache` and `fpm`
- Adding section `.examples/dockerfiles`
- Adding section `.examples/dockerfiles/cron` to combine app & external cron-jobs
- Adding section `.examples/dockerfiles/smtp` for further SMTP-settings
2018-05-20 15:44:03 +02:00
Philipp Holzer 57afa34813
Fixed composer.phar "update" to "install" (because in both cases, we use "install") 2018-05-19 13:14:49 +02:00
Philipp Holzer bd2fb340d2
Fixed .travis.yml config 2018-05-18 21:23:21 +02:00
Philipp Holzer 6ea2875ebf
Init the Friendica Docker Repository
- Added develop images (apache, fpm, fpm-alpine)
- Added stable images 3.6 (apache, fpm, fpm-alpine)
- Added .travis.yml for testing
2018-05-18 21:20:22 +02:00
Friendica e52a103650
Create README.md 2018-05-15 12:03:38 +02:00
Friendica b62d5f2f6d
Create LICENSE 2018-05-15 12:02:25 +02:00