From dmuriel at bitergia.com Thu Apr 21 13:20:34 2016 From: dmuriel at bitergia.com (David Muriel) Date: Thu, 21 Apr 2016 13:20:34 +0200 Subject: [Fiware-developer-experience] Rebase of the develop branch Message-ID: Hi, Since some of the latest merged changes were merged on master, we need to bring those changes to the develop branch, as that is now the default branch. To do this, the easiest approach is to rebase the develop branch on top of the master branch before any more changes land on develop. I was going to do this and then send instructions on how to update your repositories to use the rebased branch, but the develop branch in the github repository is marked as protected and we don't have permission to temporarily disable this and push the rebase to github. Jos? Manuel, could you temporarily disable this protection just so we can push the rebased branch and then enable it again? Another option is for you to make this change following this steps: git clone https://github.com/Fiware/tutorials.TourGuide-App.git tourguide-rebase-develop-branch cd tourguide-rebase-develop-branch git checkout -b master origin/master git rebase master develop git push --force origin develop After this change is pushed to the github repository, we all need to update our local copy of the repository and our forks to sincronize the branch. To do this, follow this steps: * First, make a backup copy of your local repository, just in case something goes horribly wrong. If using linux, this should be enough: cp -a my-local-repository my-local-repository-$( date +%Y%m%d ) * In case you have a local copy of the main repository: git checkout develop git pull --rebase * For your local copy of the fork repository: * Get the latest changes from the `upstream` repository: git fetch upstream * If you have local uncommited changes, stash them before rebasing using git stash * Rebase the `develop` branch: git rebase upstream/develop develop * Rebase any branch stemmed from develop: git rebase develop * Push changes to your fork on github git push --force origin develop git push --force origin Remember that all development must be done against the develop branch. Regards, -- David Muriel. From pablofernandezmoniz at gmail.com Fri Apr 22 13:59:14 2016 From: pablofernandezmoniz at gmail.com (=?UTF-8?Q?Pablo_Fern=C3=A1ndez_Moniz?=) Date: Fri, 22 Apr 2016 12:59:14 +0100 Subject: [Fiware-developer-experience] Mongodb is not up to date in docker-compose. Message-ID: Hi, We are working in a guide of Orion and we are using the Tourguide as an example. With this task we have noticed that the docker-compose file is not up to date with the last image that contains the restaurant data. Since the restaurant feeder is not executed when the tourguide-app is built and the mongodb image with the preloaded data is used instead, the tourguide-app docker does not reflect the changes in the source code. Currently the mongodb image is using the build date as tag, looking forward help, one suggestion is to use a latest tag that corresponds with the last 'date' tag used. This could give us the option to always use the latest image available or a specific one. Kind regards! ULPGC Team -------------- next part -------------- An HTML attachment was scrubbed... URL: From alberto.martin at bitergia.com Fri Apr 22 15:03:10 2016 From: alberto.martin at bitergia.com (=?UTF-8?Q?Alberto_Mart=C3=ADn_Casado?=) Date: Fri, 22 Apr 2016 15:03:10 +0200 Subject: [Fiware-developer-experience] Mongodb is not up to date in docker-compose. In-Reply-To: References: Message-ID: Hi Pablo! The tourguide data image that is being used in the docker-compose is outdated because of the on-going development, but the newer images (the ones fixing the data model) are already available in Docker-hub. You already have the chance to use specific ones. Just check: https://hub.docker.com/r/fiware/tutorials.tourguide-app.restaurant-data/tags/ The image with the latest tag (*20160420*) works with the latest Orion version (1.0.0). Best! Alberto Mart?n On Fri, Apr 22, 2016 at 1:59 PM, Pablo Fern?ndez Moniz < pablofernandezmoniz at gmail.com> wrote: > Hi, > > We are working in a guide of Orion and we are using the Tourguide as an > example. > > With this task we have noticed that the docker-compose file is not up to > date with the last image that contains the restaurant data. Since the > restaurant feeder is not executed when the tourguide-app is built and the > mongodb image with the preloaded data is used instead, the tourguide-app > docker does not reflect the changes in the source code. > > Currently the mongodb image is using the build date as tag, looking > forward help, one suggestion is to use a latest tag that corresponds with > the last 'date' tag used. This could give us the option to always use the > latest image available or a specific one. > > > Kind regards! > > ULPGC Team > > _______________________________________________ > Fiware-developer-experience mailing list > Fiware-developer-experience at lists.fiware.org > https://lists.fiware.org/listinfo/fiware-developer-experience > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dmuriel at bitergia.com Thu Apr 28 16:10:43 2016 From: dmuriel at bitergia.com (David Muriel) Date: Thu, 28 Apr 2016 16:10:43 +0200 Subject: [Fiware-developer-experience] Rebase of the develop branch In-Reply-To: References: Message-ID: Hi, The rebase of the develop branch is done, so you will need to update your local repositories and forks. You can find instructions on how to update your repositories here: https://github.com/Fiware/tutorials.TourGuide-App/issues/67#issuecomment-215433141 Do not hesitate to contact me or reply to this message if you have any trouble with the update. Just remember to backup your local copy of the repositories before updating, just in case. And remember that all development must be done against the develop branch. Regards, -- David Muriel.