hard code ubuntu versions for these non-parameterized dockerfiles

ros-infrastructure · Mar 14, 2016 · be01b7f · be01b7f
1 parent dff5fb7
commit be01b7f
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/ros_buildfarm/templates/devel/devel_create_reconfigure_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_create_reconfigure_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/devel/devel_create_tasks.Dockerfile.em b/ros_buildfarm/templates/devel/devel_create_tasks.Dockerfile.em
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
+    os_name='ubuntu',
     os_code_name=os_code_name,
     timezone=timezone,
 ))@

diff --git a/ros_buildfarm/templates/doc/doc_create_reconfigure_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_create_reconfigure_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
+    os_name='ubuntu',
     os_code_name=os_code_name,
     timezone=timezone,
 ))@

diff --git a/ros_buildfarm/templates/doc/doc_independent_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_independent_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/doc/doc_metadata_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_metadata_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/misc/rosdistro_cache_task.Dockerfile.em b/ros_buildfarm/templates/misc/rosdistro_cache_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/release/release_check_sync_criteria_task.Dockerfile.em b/ros_buildfarm/templates/release/release_check_sync_criteria_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/release/release_create_reconfigure_task.Dockerfile.em b/ros_buildfarm/templates/release/release_create_reconfigure_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/release/release_create_trigger_task.Dockerfile.em b/ros_buildfarm/templates/release/release_create_trigger_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/status/release_compare_page_task.Dockerfile.em b/ros_buildfarm/templates/status/release_compare_page_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@
 

diff --git a/ros_buildfarm/templates/status/release_status_page_task.Dockerfile.em b/ros_buildfarm/templates/status/release_status_page_task.Dockerfile.em
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 @(TEMPLATE(
     'snippet/setup_locale.Dockerfile.em',
-    os_name=os_name,
-    os_code_name=os_code_name,
+    os_name='ubuntu',
+    os_code_name='trusty',
     timezone=timezone,
 ))@