Clean up spacing (#376)

athackst · Dec 22, 2023 · 8f70084 · 8f70084
1 parent f0da0cd
commit 8f70084
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/gz/garden.Dockerfile b/gz/garden.Dockerfile
@@ -3,7 +3,7 @@
 ##################################################
 
 ###########################################
-# Base image 
+# Base image
 ###########################################
 FROM ubuntu:22.04 AS base
 
@@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y git-core bash-completion \
   && rm -rf /var/lib/apt/lists/* 
 
 ###########################################
-# Develop image 
+# Develop image
 ###########################################
 FROM base AS dev
 
@@ -95,7 +95,7 @@ RUN wget https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/co
 ENV DEBIAN_FRONTEND=
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM base AS nvidia
 
@@ -118,7 +118,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute
 ENV QT_X11_NO_MITSHM 1
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM dev AS nvidia-dev
 

diff --git a/gz/harmonic.Dockerfile b/gz/harmonic.Dockerfile
@@ -3,7 +3,7 @@
 ##################################################
 
 ###########################################
-# Base image 
+# Base image
 ###########################################
 FROM ubuntu:22.04 AS base
 
@@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y git-core bash-completion \
   && rm -rf /var/lib/apt/lists/* 
 
 ###########################################
-# Develop image 
+# Develop image
 ###########################################
 FROM base AS dev
 
@@ -95,7 +95,7 @@ RUN wget https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/co
 ENV DEBIAN_FRONTEND=
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM base AS nvidia
 
@@ -118,7 +118,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute
 ENV QT_X11_NO_MITSHM 1
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM dev AS nvidia-dev
 

diff --git a/template/gz.dockerfile.jinja b/template/gz.dockerfile.jinja
@@ -3,7 +3,7 @@
 ##################################################
 
 ###########################################
-# Base image 
+# Base image
 ###########################################
 FROM ubuntu:{{ ubuntu_distro }} AS base
 
@@ -24,14 +24,15 @@ RUN apt-get update && apt-get install -q -y \
     wget \
   && wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg \
   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null \
+  {%- if prerelease %}&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-prerelease $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-prerelease.list > /dev/null \{% endif %}
   && apt-get update && apt-get install -y -q \
     gz-{{ gz_distro }} \
   && rm -rf /var/lib/apt/lists/*
 
 {% include 'snippits/ros_user.jinja' %}
 
 ###########################################
-# Develop image 
+# Develop image
 ###########################################
 FROM base AS dev
 
@@ -65,14 +66,14 @@ RUN wget https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/co
 ENV DEBIAN_FRONTEND=
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM base AS nvidia
 
 {% include 'snippits/nvidia.jinja' %}
 
 ###########################################
-# Nvidia image 
+# Nvidia image
 ###########################################
 FROM dev AS nvidia-dev
 

diff --git a/template/readme.md.jinja b/template/readme.md.jinja
@@ -14,7 +14,7 @@ docker pull althack/{{ repo_name }}:{{ dockerfiles[0].name }}-{{ dockerfiles[0].
 The main docker image tags are:
 
 {% for file in dockerfiles %}
-{{ file.name }}{% if file.eol %} (eol){% endif %}
+{{ file.name }}{% if file.eol %} (eol){% endif %}{% if file.prerelease %} (prerelease){% endif %}
   {% for target in file.targets %}
 * [{{ file.name }}-{{ target }}](https://github.com/athackst/dockerfiles/blob/main/{{ repo_name }}/{{ file.name }}.Dockerfile)
   {%- endfor %}