Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MF-663 - enable nginx port conf from docker env #769

Merged
merged 34 commits into from
Jun 24, 2019
Merged

MF-663 - enable nginx port conf from docker env #769

merged 34 commits into from
Jun 24, 2019

Commits on Jun 21, 2019

  1. MF-722 - Change UUID lib (absmach#746) 

    * Update uuid package and update things serivce

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Update bootstrap service tests

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Update existing postgres writer tests

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @anovakovic01 @mteodor
    anovakovic01 authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    6e2ccd2 View commit details
    Browse the repository at this point in the history

  2. MF-732 - Add Postgres reader (absmach#740) 

    * NOISSUE - Fix Readers logs

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* MF-732 - Add Postgres reader

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix total count

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Rm commented code

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add Postgres reader tests

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix editor format

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Change UUID lib

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @manuio @mteodor
    manuio authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    4d8723e View commit details
    Browse the repository at this point in the history

  3. MF-742 - Things to support single user scenario (absmach#749) 

    * Add single user mode to things service

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add tests for things/users package

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Update init order in main

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @anovakovic01 @mteodor
    anovakovic01 authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    899ab61 View commit details
    Browse the repository at this point in the history

  4. Update grpc and protobuf deps in mqtt adapter (absmach#751) 

    Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @anovakovic01 @mteodor
    anovakovic01 authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    315f8fe View commit details
    Browse the repository at this point in the history

  5. Fix MQTT raw message deserialization (absmach#753) 

    Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @anovakovic01 @mteodor
    anovakovic01 authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    8ec0857 View commit details
    Browse the repository at this point in the history

  6. NOISSUE - Add certificate fields to the Bootstrap service (absmach#752) 

    * Add cert fields to the BS

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Add cert fields when creating a config

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Add update cert endpoint

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Fix key column name

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Add cert fields to db converters

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Secure cert update endpoint

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Authroize cert update methods

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Fix Bootstrap service tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Add cert update service tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Update endpoit tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Update API docs

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Update request tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Fix request tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Update repository tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Fix typo in repo tests

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @dborovcanin @mteodor
    dborovcanin authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    464c8b8 View commit details
    Browse the repository at this point in the history

  7. NOISSUE - Add searchable Things name (absmach#750) 

    * NOISSUE - Add searchable Things name

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix reviews

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix typo

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add postgres schema validation and tests

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add namme tests in requests_test

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Typo fix

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Rm requests_test

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add name in ListThings loggins

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add invalidName var for tests

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Set maxNameSize to 1024

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix postgres test

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix total when filtering things by name

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix review

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @manuio @mteodor
    manuio authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    451c31d View commit details
    Browse the repository at this point in the history

  8. Add missing Websocket.js into docker ui image (absmach#755) 

    Signed-off-by: Ivan Milošević <iva@blokovi.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @blokovi @mteodor
    blokovi authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    a1f5b0a View commit details
    Browse the repository at this point in the history

  9. MF-466 - ARM docker deployment (absmach#756) 

    * Add arm Dockerfiles
Change version of postgres images in docker-compose to use versions with  multiarch

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* docker compose file

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove bin qemu file

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove unnecesarry comments

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Add make dockers_arm32v7 in Makefile

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Remove docker/Dockerfile.arm

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Add build for arm32v7 in ui Makefile

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Add arm32v7 tags

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* add docker-compose for arm
remove thing-db in docker compose (use same db as user)
fix dockerfile and makefile

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix thing database env variable

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Switch back to separate database for things and users

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* rename arm32v7 to arm

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove arm32v7 tag
rename arm32v7 image names

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Rename command for making mqtt and ui individual images, to match other miscroservices

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Push arm docker images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix fucntion call in ci.sh

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* mergiing ui/Dockerfile

Signed-off-by: Ivan Milošević <iva@blokovi.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @blokovi @mteodor
    blokovi authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    648cd5d View commit details
    Browse the repository at this point in the history

  10. NOISSUE - Add searchable Channels name (absmach#754) 

    * NOISSUE - Add searchable Things name

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix reviews

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix typo

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add postgres schema validation and tests

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add namme tests in requests_test

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* NOISSUE - Add searchable Channels name

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix test description

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix bootstrap mocks

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix reviews

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @manuio @mteodor
    manuio authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    92fdb8d View commit details
    Browse the repository at this point in the history

  11. NOISSUE - Remove installing non-existent package in ci (absmach#758) 

    * Remove installing non-existent  package from ci

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove branch master condition in ci.sh to test it

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix syntax error

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* update apt

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* build arm images for latest release
push ui and mqtt arm images
install only qemu-user-static

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* clean docker after pushing amd64 images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* installing all qemu app

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove docker images before building ui and mqtt arm-images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* prune dockers and test only arm build

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix syntax error

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix moving qemu-arm-static

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* installing qemu with apt-get

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* add another apt-get update

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* apt install one liner

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* testing ci script

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* After installing qemu, get appropriate version

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Test ci without amd64 dockers

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove tests from ci for test purpose

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Uncomment commands

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Remove whitespace and change order of building images

Signed-off-by: Ivan Milošević <iva@blokovi.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @blokovi @mteodor
    blokovi authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f702dec View commit details
    Browse the repository at this point in the history

  12. nginx 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f7c6594 View commit details
    Browse the repository at this point in the history

  13. change to openresty 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    a964e22 View commit details
    Browse the repository at this point in the history

  14. change to openresty and accept env from docker compose 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    4075515 View commit details
    Browse the repository at this point in the history

  15. revert to master 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    9398131 View commit details
    Browse the repository at this point in the history

  16. revert to master 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    35c1a0d View commit details
    Browse the repository at this point in the history

  17. revert to master 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    8f5003b View commit details
    Browse the repository at this point in the history

  18. NOISSUE - Fix Docker for ARM (absmach#760) 

    * NOISSUE - Fix Docker for ARM

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* Correct ARGs

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* Fix docker-compose for ARM

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* Add docker manifest

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* cp not mv qemu from mf root

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix amd64 docker names for ui and mqtt images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* edit ci.sh for testing purposes

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove bachslash from make manifest
edits in ci for testing purposes

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix manifest call

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* add manifest on version realese
delete space before latest argument
fix for loop in manifest creation

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* include tests

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* docker system prune
remove tests for testin purposes

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Add variant in manifest file for armv7

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Remove white space

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* paralelise the compilation

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix place of -j$NPROC

Signed-off-by: Ivan Milošević <iva@blokovi.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @drasko @mteodor
    drasko authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    bd2f79e View commit details
    Browse the repository at this point in the history

  19. adding env variable 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    32dc502 View commit details
    Browse the repository at this point in the history

  20. fix variant option for manifest annotate (absmach#765) 

    Signed-off-by: Ivan Milošević <iva@blokovi.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @blokovi @mteodor
    blokovi authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    797a4c5 View commit details
    Browse the repository at this point in the history

  21. enable port configure from env var in docker-compose 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    636e76f View commit details
    Browse the repository at this point in the history

  22. enable port configure from env var in docker-compose 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    5f5e818 View commit details
    Browse the repository at this point in the history

  23. enable port configure from env var in docker-compose 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    75345e1 View commit details
    Browse the repository at this point in the history

  24. use docker env to set port 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    63a51fe View commit details
    Browse the repository at this point in the history

  25. add env to conf port in nginx.conf 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    2e479c6 View commit details
    Browse the repository at this point in the history

  26. replace string with docker env 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    8448179 View commit details
    Browse the repository at this point in the history

  27. replace string with docker env 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    e1011aa View commit details
    Browse the repository at this point in the history

  28. Update docs (absmach#766) 

    Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @dborovcanin @mteodor
    dborovcanin authored and mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    7774f5c View commit details
    Browse the repository at this point in the history

  29. enable nginx port conf from docker env 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    a06b0ed View commit details
    Browse the repository at this point in the history

  30. remove not needed comment 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    769a73f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Merge branch 'master' into MF-663

    @mteodor
    mteodor committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    7bc3df8 View commit details
    Browse the repository at this point in the history

  2. adding .env file for default UI_PORT - if no enviroment UI_PORT is se… 

    …t value from .env file is used

Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    5f13c21 View commit details
    Browse the repository at this point in the history

  3. get default UI_PORT variable value from .env file 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    314bf1d View commit details
    Browse the repository at this point in the history

  4. set default port value to 3000 

    Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
    @mteodor
    mteodor committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    1a08349 View commit details
    Browse the repository at this point in the history