2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-11-13 21:23:40 +01:00
Commit graph

314 commits

Author SHA1 Message Date
Hypolite Petovan 951fdf7773
Merge pull request #24 from nupplaphil/database_retries
Added Datbase retry checks (if Friendica is faster than the DB)
2018-06-10 11:59:04 -04:00
Philipp Holzer 733bf8a0ba
Added different error-msg 2018-06-10 13:47:31 +02:00
Philipp Holzer 81bdd6ff72
Added Datbase retry checks (if Friendica is faster than the DB) 2018-06-10 13:44:33 +02:00
Hypolite Petovan 5c92c61d1b
Merge pull request #23 from nupplaphil/bugfixings
Bugfixings
2018-06-09 17:04:00 -04:00
Philipp Holzer 4877b846a8
Bugfixings
- directory for worker.php changed to `bin/`
- `composer install` isn't necessary for stable images
- copy_sources should work for future *-rc branches too
2018-06-09 14:55:51 +02:00
Hypolite Petovan 8ec144f1bd
Merge pull request #22 from nupplaphil/friendica_bugfix
Bugfixing friendica shell script
2018-06-06 19:30:30 -04:00
Philipp Holzer f5925ac3fa
Bugfixing friendica shell script
- update was not working for develop branch
2018-06-06 23:19:33 +02:00
Hypolite Petovan d261b0cf4a
Merge pull request #21 from nupplaphil/update_readme
Update README
2018-06-06 16:26:15 -04:00
Philipp Holzer 25878103ce
Update README 2018-06-06 22:07:15 +02:00
Hypolite Petovan 6ba4108d3d
Merge pull request #20 from nupplaphil/bugfix_smtp
Bugfix SMTP
2018-06-06 15:16:03 -04:00
Philipp Holzer bdd7503c84
Updated link to stack.yml (because of the new smtp-setting) 2018-06-06 21:13:12 +02:00
Philipp Holzer bba11a1eed
- Updated Dockerfiles 2018-06-06 20:59:45 +02:00
Philipp Holzer 5e3bf7e630
- Changed docker-compose examples because of the new smtp-environment 2018-06-06 20:58:45 +02:00
Philipp Holzer e0c270dd08
Deleted SMTP-Dockerfiles 2018-06-06 20:41:01 +02:00
Philipp Holzer fec33c98be
Bugfixings SMTP /
- changed sendmail to ssmtp support
- deleted smtp-examples (not necessary anymore)
- added vendor libraries in stable-docker images ("full" package)
- changed stack.yml to new SMTP behavior
2018-06-06 20:37:02 +02:00
Hypolite Petovan 4043b7901d
Merge pull request #18 from nupplaphil/bugfix_friendica_console
Bugfix `friendica console` command
2018-06-01 22:49:15 -04:00
Philipp Holzer fff22153e4
Bugfix friendica console command
- added to every installation type
- fixing the function call parameters
2018-06-02 00:16:37 +02:00
Hypolite Petovan 987edd5dae
Merge pull request #15 from nupplaphil/version_upgrade
Upgrade VERSION
2018-06-01 13:08:59 -04:00
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