[Git][noosfero/noosfero][master] 18 commits: Adds Docker dev env alternative w/ docker-compose

[Joenio Costa]

Joenio Costa pushed to branch master at Noosfero / noosfero


Commits:
7c17478a by Gabriel Silva at 2018-01-24T12:39:48-02:00
Adds Docker dev env alternative w/ docker-compose

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
501c0e92 by Álax Alves at 2018-01-24T12:39:48-02:00
Adds docker-compose.yml in project root and updates yaml script

- - - - -
8a0c83fc by Marcos Ronaldo at 2018-01-24T12:39:48-02:00
Bring docker-compose file to docker folder

 Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
 Signed-off-by: Fabio Teixeira <fabio1079 at gmail.com>

- - - - -
3559b75b by Marcos Ronaldo at 2018-01-24T12:39:49-02:00
Launch production with dokcer-compose

Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079 at gmail.com>

- - - - -
7ec104f9 by Marcos Ronaldo at 2018-01-24T12:39:49-02:00
Improving docker behaviour

  Signed-off-by: Luan Guimarães <guimaraesluan at me.com>

(cherry picked from commit f5bc890297038827187706855afc78d945ed4e86)

- - - - -
112c11b0 by Marcos Ronaldo at 2018-01-24T12:39:49-02:00
Fix bundle cache on docker

(cherry picked from commit 2dbd9756ddb8bbd9a75f1668885305d4283083c9)

- - - - -
8f14d2b5 by Joenio Costa at 2018-01-24T12:39:49-02:00
refactoring Dockerfile

- - - - -
e1b1b98e by Joenio Costa at 2018-01-24T12:39:49-02:00
wait postgresql service

- - - - -
60413e65 by Luan Guimarães at 2018-01-25T11:26:36-02:00
Remove several broken symlinks

- - - - -
93169d59 by Luan Guimarães at 2018-01-25T11:28:01-02:00
Generalizing database configuration file

- - - - -
482df356 by Luan Guimarães at 2018-01-25T11:31:04-02:00
Fix docker bundle path problem using cache

- - - - -
e7b2d074 by Luan Guimarães at 2018-01-25T11:32:44-02:00
Fix docker database connection

- - - - -
ff742652 by Luan Guimarães at 2018-01-25T12:42:23-02:00
Configuring docker for production

- - - - -
9a0e93be by Luan Guimarães at 2018-01-25T14:41:41-02:00
Moves docker db configuration to a custom file

Gitlab CI was broken because some conflict between docker and
the default database configuration when them were in the
same file.

- - - - -
71254b89 by Luan Guimarães at 2018-01-25T15:20:26-02:00
Add new docker documentation @ HACKING.md

- - - - -
7ec2961f by Joenio Costa at 2018-01-29T16:34:49-02:00
removing external dependencies for tango-icon-theme and pidgin-data

copying tango and pidgin icons inside noosfero source, only icons used by noosfero

closes #300

- - - - -
923f1e9c by Joenio Costa at 2018-01-29T17:21:31-02:00
cosmetic changes and removing source-code comments

- - - - -
a21a1787 by Joenio Costa at 2018-01-29T17:49:12-02:00
Merge branch 'luanguimaraesla/noosfero-compose'

- - - - -


30 changed files:

- .travis.yml
- HACKING.md
- INSTALL.chat.md
- INSTALL.md
- circle.yml
- + config/database.yml.docker
- config/docker/dev/Dockerfile
- + config/docker/dev/entrypoint.sh
- + config/docker/dev/osx/Dockerfile
- + config/docker/dev/osx/docker-compose.yml
- + config/docker/dev/osx/docker-sync.yml
- + config/docker/prod/Dockerfile
- + config/docker/prod/entrypoint.sh
- config/initializers/default_icon_theme.rb
- debian/control
- + dev.yml
- gitignore.example
- + lib/tasks/db.rake
- + prod.yml
- public/designs/icons/pidgin/emoticons.js
- − public/designs/icons/pidgin/pidgin
- + public/designs/icons/pidgin/pidgin/emotes/default/angel.png
- + public/designs/icons/pidgin/pidgin/emotes/default/confused.png
- + public/designs/icons/pidgin/pidgin/emotes/default/crying.png
- + public/designs/icons/pidgin/pidgin/emotes/default/devil.png
- + public/designs/icons/pidgin/pidgin/emotes/default/excited.png
- + public/designs/icons/pidgin/pidgin/emotes/default/in_love.png
- + public/designs/icons/pidgin/pidgin/emotes/default/kiss.png
- + public/designs/icons/pidgin/pidgin/emotes/default/love-over.png
- + public/designs/icons/pidgin/pidgin/emotes/default/mean.png


The diff was not included because it is too large.


View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/648669f9c82ad45f5d1de6f7013aac1b8af527f0...a21a17874364e0d7a9e7ca3c64e139ce60f0c170

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/648669f9c82ad45f5d1de6f7013aac1b8af527f0...a21a17874364e0d7a9e7ca3c64e139ce60f0c170
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180129/ff8763af/attachment-0001.html>