* Changed to generic base image

Signed-off-by: Christian Berger <christian.berger@gu.se>
chalmers-revere · Mar 25, 2017 · 72f033c · 72f033c
1 parent b32d5b4
commit 72f033c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/usecases/latest/gcdc16-intersection-host/Dockerfile b/usecases/latest/gcdc16-intersection-host/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-#FROM chalmersrevere/copplar-core-on-opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete
+#FROM chalmersrevere/copplar-core-on-opendlv-on-opendlv-core-on-opendavinci-on-base:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base
diff --git a/usecases/latest/gcdc16-intersection-left/Dockerfile b/usecases/latest/gcdc16-intersection-left/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/gcdc16-intersection-platoon/Dockerfile b/usecases/latest/gcdc16-intersection-platoon/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/gcdc16-intersection-right/Dockerfile b/usecases/latest/gcdc16-intersection-right/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/gcdc16-intersection-sensortest/Dockerfile b/usecases/latest/gcdc16-intersection-sensortest/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/iv16/Dockerfile b/usecases/latest/iv16/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/recording.asta.jan/Dockerfile b/usecases/latest/recording.asta.jan/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/recording.asta.jan/docker-compose.yml b/usecases/latest/recording.asta.jan/docker-compose.yml
@@ -12,7 +12,7 @@ version: '2'
 ############################
 #To be updated: Root user is required to access video devices. This is why root user is used for proxy1, proxy2, and proxy3. The OpenDaVINCI base image "seresearch/opendavinci-ubuntu-16.04-complete" defines odv as a normal user. It is possible to run proxy1, proxy2, and proxy3 with odv as the user by adding odv to the video user group during docker run:
 
-#docker run -ti --rm --net=host -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --ipc=host --user=odv --group-add video --device=/dev/video0:/dev/video0 seresearch/opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest /opt/opendlv.core/bin/opendlv-core-system-proxy-camera --cid=111  --id=1 --freq=20
+#docker run -ti --rm --net=host -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --ipc=host --user=odv --group-add video --device=/dev/video0:/dev/video0 seresearch/opendlv-core-on-opendavinci-on-base:latest /opt/opendlv.core/bin/opendlv-core-system-proxy-camera --cid=111  --id=1 --freq=20
 
 #However, currently "--group-add" is not supported by docker-compose yet. This docker-compose file will be updated with "--group-add" when docker-compose starts to include this feature in future releases.
 ############################

diff --git a/usecases/latest/signaladapter/Dockerfile b/usecases/latest/signaladapter/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/test-detectlane-replay/Dockerfile b/usecases/latest/test-detectlane-replay/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/test-detectlane/Dockerfile b/usecases/latest/test-detectlane/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
 
diff --git a/usecases/latest/test-geolocation/Dockerfile b/usecases/latest/test-geolocation/Dockerfile
@@ -17,4 +17,4 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
diff --git a/usecases/latest/test-v2v/Dockerfile b/usecases/latest/test-v2v/Dockerfile
@@ -17,5 +17,5 @@
 
 # Date: 2016-09-09
 
-FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
+FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,5 +17,5 @@

		# Date: 2016-09-09

		FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
		FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@

		# Date: 2016-09-09

		FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-ubuntu-16.04-complete:latest
		FROM seresearch/opendlv-on-opendlv-core-on-opendavinci-on-base:latest