Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit 3bf1310

Browse files
committed
Merge branch 'feature/commonalize' into feature/update_auth
2 parents d47fecd + bf199e8 commit 3bf1310

26 files changed

+1672
-835
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For example, you can deploy a ROS program to the robot and access the raw data o
2828
|:--|:--|:--|
2929
|[kubernetes](https://kubernetes.io/)|Container Orchestration Platform|1.14.1|
3030
|[deployer](https://github.com/RoboticBase/mqtt-kube-operator)|MQTT client to deploy (or delete) a resource to its own Kubernetes|0.2.0|
31-
|[bridge](https://github.com/RoboticBase/fiware_ros_turtlebot3_bridge)|ROS package to act as a bridge FIWARE orion and ROS|0.2.2|
31+
|[bridge](https://github.com/RoboticBase/fiware_ros_bridge)|ROS package to act as a bridge FIWARE orion and ROS|0.2.2|
3232
|[operator](https://github.com/RoboticBase/fiware_ros_turtlebot3_operator)|ROS package to control turtlebot3 (simulator and physical robot)|0.2.1|
3333

3434
## An experiment to prove our concept
@@ -143,7 +143,7 @@ Please see this repository [ogcaizu/ogc-poc1](https://github.com/ogcaizu/ogc-poc
143143
* An android application for Xperia Hello! It connect to FIWARE using MQTT(S).
144144

145145
### ROS package
146-
* [RoboticBase/fiware_ros_turtlebot3_bridge](https://github.com/RoboticBase/fiware_ros_turtlebot3_bridge)
146+
* [RoboticBase/fiware_ros_bridge](https://github.com/RoboticBase/fiware_ros_bridge)
147147
* A [ROS](http://wiki.ros.org/) pakage witten by python2 in order to act as a bridge between FIWARE and ROS nodes.
148148
* When a MQTT message is received from a MQTT topic, this package create ROS message and publish a ROS message to a ROS topic.
149149
* At the opposite, when a ROS message is received from a ROS topic, this package publish a MQTT message to a MQTT topic.

docs/en-jupyter_notebook/azure_aks/05_deploy_containers_to_turtlebot3.ipynb

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
"cell_type": "markdown",
313313
"metadata": {},
314314
"source": [
315-
"### common procedure: deploy fiware-ros-turtlebot3-bridge"
315+
"### common procedure: deploy fiware-ros-bridge"
316316
]
317317
},
318318
{
@@ -322,6 +322,15 @@
322322
"#### build container image"
323323
]
324324
},
325+
{
326+
"cell_type": "code",
327+
"execution_count": null,
328+
"metadata": {},
329+
"outputs": [],
330+
"source": [
331+
"export BRIDGE_GIT_REV=\"0.3.0\""
332+
]
333+
},
325334
{
326335
"cell_type": "code",
327336
"execution_count": null,
@@ -330,7 +339,7 @@
330339
},
331340
"outputs": [],
332341
"source": [
333-
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-bridge:0.2.2 ros/fiware-ros-turtlebot3-bridge"
342+
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-bridge:${BRIDGE_GIT_REV} ros/fiware-ros-bridge"
334343
]
335344
},
336345
{
@@ -352,7 +361,7 @@
352361
},
353362
"outputs": [],
354363
"source": [
355-
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-bridge:0.2.2"
364+
"docker push ${REPOSITORY}/roboticbase/fiware-ros-bridge:${BRIDGE_GIT_REV}"
356365
]
357366
},
358367
{
@@ -414,11 +423,11 @@
414423
"metadata": {},
415424
"outputs": [],
416425
"source": [
417-
"envsubst < ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-secret.yaml > /tmp/fiware-ros-turtlebot3-bridge-secret.yaml\n",
426+
"envsubst < ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-secret.yaml > /tmp/fiware-ros-bridge-secret.yaml\n",
418427
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
419428
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -v /tmp:/tmp -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
420-
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-turtlebot3-bridge-secret.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
421-
"rm /tmp/fiware-ros-turtlebot3-bridge-secret.yaml"
429+
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-bridge-secret.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
430+
"rm /tmp/fiware-ros-bridge-secret.yaml"
422431
]
423432
},
424433
{
@@ -451,7 +460,7 @@
451460
"source": [
452461
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
453462
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
454-
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-configmap.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
463+
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-configmap.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
455464
]
456465
},
457466
{
@@ -482,7 +491,7 @@
482491
"source": [
483492
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
484493
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
485-
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-service.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
494+
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-service.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
486495
]
487496
},
488497
{
@@ -513,11 +522,11 @@
513522
},
514523
"outputs": [],
515524
"source": [
516-
"envsubst < ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-deployment-acr.yaml > /tmp/fiware-ros-turtlebot3-bridge-deployment-acr.yaml\n",
525+
"envsubst < ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-deployment-acr.yaml > /tmp/fiware-ros-bridge-deployment-acr.yaml\n",
517526
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
518527
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -v /tmp:/tmp -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
519-
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-turtlebot3-bridge-deployment-acr.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
520-
"rm /tmp/fiware-ros-turtlebot3-bridge-deployment-acr.yaml"
528+
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-bridge-deployment-acr.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
529+
"rm /tmp/fiware-ros-bridge-deployment-acr.yaml"
521530
]
522531
},
523532
{
@@ -569,6 +578,15 @@
569578
"#### build container image"
570579
]
571580
},
581+
{
582+
"cell_type": "code",
583+
"execution_count": null,
584+
"metadata": {},
585+
"outputs": [],
586+
"source": [
587+
"export OPERATOR_GIT_REV=\"0.3.0\""
588+
]
589+
},
572590
{
573591
"cell_type": "code",
574592
"execution_count": null,
@@ -577,7 +595,7 @@
577595
},
578596
"outputs": [],
579597
"source": [
580-
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:0.2.1 ros/fiware-ros-turtlebot3-operator"
598+
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:${OPERATOR_GIT_REV} ros/fiware-ros-turtlebot3-operator"
581599
]
582600
},
583601
{
@@ -597,7 +615,7 @@
597615
"metadata": {},
598616
"outputs": [],
599617
"source": [
600-
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:0.2.1"
618+
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:${OPERATOR_GIT_REV}"
601619
]
602620
},
603621
{

docs/en-jupyter_notebook/azure_aks/06_operate_turtlebot3.ipynb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,15 @@
310310
"### re-deploy `fiware-ros-turtlebot3-operator` with other parameters"
311311
]
312312
},
313+
{
314+
"cell_type": "code",
315+
"execution_count": null,
316+
"metadata": {},
317+
"outputs": [],
318+
"source": [
319+
"export OPERATOR_GIT_REV=\"0.3.0\""
320+
]
321+
},
313322
{
314323
"cell_type": "code",
315324
"execution_count": null,

docs/en-jupyter_notebook/azure_aks/08_delete_containers_from_turtlebot3.ipynb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"cell_type": "markdown",
227227
"metadata": {},
228228
"source": [
229-
"### common procedure: undeploy fiware-ros-turtlebot3-bridge"
229+
"### common procedure: undeploy fiware-ros-bridge"
230230
]
231231
},
232232
{
@@ -237,7 +237,7 @@
237237
"source": [
238238
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
239239
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
240-
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-deployment-acr.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
240+
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-deployment-acr.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
241241
]
242242
},
243243
{
@@ -248,7 +248,7 @@
248248
"source": [
249249
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
250250
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
251-
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-service.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
251+
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-service.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
252252
]
253253
},
254254
{
@@ -259,7 +259,7 @@
259259
"source": [
260260
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
261261
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
262-
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-configmap.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
262+
" ${PJ_ROOT}/tools/deploy_yaml.py --delete ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-configmap.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
263263
]
264264
},
265265
{
@@ -269,11 +269,11 @@
269269
"outputs": [],
270270
"source": [
271271
"export MQTT_YAML_BASE64=\"\"\n",
272-
"envsubst < ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-secret.yaml > /tmp/fiware-ros-turtlebot3-bridge-secret.yaml\n",
272+
"envsubst < ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-secret.yaml > /tmp/fiware-ros-bridge-secret.yaml\n",
273273
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
274274
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -v /tmp:/tmp -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
275-
" ${PJ_ROOT}/tools/deploy_yaml.py --delete /tmp/fiware-ros-turtlebot3-bridge-secret.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
276-
"rm /tmp/fiware-ros-turtlebot3-bridge-secret.yaml"
275+
" ${PJ_ROOT}/tools/deploy_yaml.py --delete /tmp/fiware-ros-bridge-secret.yaml https://api.${DOMAIN} ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
276+
"rm /tmp/fiware-ros-bridge-secret.yaml"
277277
]
278278
},
279279
{

docs/en-jupyter_notebook/minikube/05_deploy_containers_to_turtlebot3.ipynb

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
"cell_type": "markdown",
276276
"metadata": {},
277277
"source": [
278-
"### common procedure: deploy fiware-ros-turtlebot3-bridge"
278+
"### common procedure: deploy fiware-ros-bridge"
279279
]
280280
},
281281
{
@@ -285,6 +285,15 @@
285285
"#### build container image"
286286
]
287287
},
288+
{
289+
"cell_type": "code",
290+
"execution_count": null,
291+
"metadata": {},
292+
"outputs": [],
293+
"source": [
294+
"export BRIDGE_GIT_REV=\"0.3.0\""
295+
]
296+
},
288297
{
289298
"cell_type": "code",
290299
"execution_count": null,
@@ -293,7 +302,7 @@
293302
},
294303
"outputs": [],
295304
"source": [
296-
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-bridge:0.2.2 ros/fiware-ros-turtlebot3-bridge"
305+
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-bridge:${BRIDGE_GIT_REV} ros/fiware-ros-bridge"
297306
]
298307
},
299308
{
@@ -304,7 +313,7 @@
304313
},
305314
"outputs": [],
306315
"source": [
307-
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-bridge:0.2.2"
316+
"docker push ${REPOSITORY}/roboticbase/fiware-ros-bridge:${BRIDGE_GIT_REV}"
308317
]
309318
},
310319
{
@@ -366,11 +375,11 @@
366375
"metadata": {},
367376
"outputs": [],
368377
"source": [
369-
"envsubst < ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-secret.yaml > /tmp/fiware-ros-turtlebot3-bridge-secret.yaml\n",
378+
"envsubst < ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-secret.yaml > /tmp/fiware-ros-bridge-secret.yaml\n",
370379
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
371380
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -v /tmp:/tmp -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
372-
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-turtlebot3-bridge-secret.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
373-
"rm /tmp/fiware-ros-turtlebot3-bridge-secret.yaml"
381+
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-bridge-secret.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
382+
"rm /tmp/fiware-ros-bridge-secret.yaml"
374383
]
375384
},
376385
{
@@ -403,7 +412,7 @@
403412
"source": [
404413
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
405414
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
406-
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-configmap.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
415+
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-configmap.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
407416
]
408417
},
409418
{
@@ -434,7 +443,7 @@
434443
"source": [
435444
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
436445
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
437-
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-service.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
446+
" ${PJ_ROOT}/tools/deploy_yaml.py ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-service.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}"
438447
]
439448
},
440449
{
@@ -465,11 +474,11 @@
465474
},
466475
"outputs": [],
467476
"source": [
468-
"envsubst < ${PJ_ROOT}/ros/fiware-ros-turtlebot3-bridge/yaml/fiware-ros-turtlebot3-bridge-deployment-minikube.yaml > /tmp/fiware-ros-turtlebot3-bridge-deployment-minikube.yaml\n",
477+
"envsubst < ${PJ_ROOT}/ros/fiware-ros-bridge/yaml/fiware-ros-bridge-deployment-minikube.yaml > /tmp/fiware-ros-bridge-deployment-minikube.yaml\n",
469478
"TOKEN=$(cat ${CORE_ROOT}/secrets/auth-tokens.json | jq '.[0].settings.bearer_tokens[0].token' -r)\n",
470479
"docker run -it --rm -v ${PJ_ROOT}:${PJ_ROOT} -v /tmp:/tmp -w ${PJ_ROOT} example_turtlebot3:0.0.1 \\\n",
471-
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-turtlebot3-bridge-deployment-minikube.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
472-
"rm /tmp/fiware-ros-turtlebot3-bridge-deployment-minikube.yaml"
480+
" ${PJ_ROOT}/tools/deploy_yaml.py /tmp/fiware-ros-bridge-deployment-minikube.yaml http://${HOST_IPADDR}:8080 ${TOKEN} ${FIWARE_SERVICE} ${DEPLOYER_SERVICEPATH} ${DEPLOYER_TYPE} ${DEPLOYER_ID}\n",
481+
"rm /tmp/fiware-ros-bridge-deployment-minikube.yaml"
473482
]
474483
},
475484
{
@@ -521,6 +530,15 @@
521530
"#### build container image"
522531
]
523532
},
533+
{
534+
"cell_type": "code",
535+
"execution_count": null,
536+
"metadata": {},
537+
"outputs": [],
538+
"source": [
539+
"export OPERATOR_GIT_REV=\"0.3.0\""
540+
]
541+
},
524542
{
525543
"cell_type": "code",
526544
"execution_count": null,
@@ -529,7 +547,7 @@
529547
},
530548
"outputs": [],
531549
"source": [
532-
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:0.2.1 ros/fiware-ros-turtlebot3-operator"
550+
"docker build -t ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:${OPERATOR_GIT_REV} ros/fiware-ros-turtlebot3-operator"
533551
]
534552
},
535553
{
@@ -538,7 +556,7 @@
538556
"metadata": {},
539557
"outputs": [],
540558
"source": [
541-
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:0.2.1"
559+
"docker push ${REPOSITORY}/roboticbase/fiware-ros-turtlebot3-operator:${OPERATOR_GIT_REV}"
542560
]
543561
},
544562
{

docs/en-jupyter_notebook/minikube/06_operate_turtlebot3.ipynb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,15 @@
331331
"### re-deploy `fiware-ros-turtlebot3-operator` with other parameters"
332332
]
333333
},
334+
{
335+
"cell_type": "code",
336+
"execution_count": null,
337+
"metadata": {},
338+
"outputs": [],
339+
"source": [
340+
"export OPERATOR_GIT_REV=\"0.3.0\""
341+
]
342+
},
334343
{
335344
"cell_type": "code",
336345
"execution_count": null,

0 commit comments

Comments
 (0)