[gazebo] add gz11 focal image and make it latest#8030
Merged
yosifkit merged 2 commits intodocker-library:masterfrom May 19, 2020
Merged
[gazebo] add gz11 focal image and make it latest#8030yosifkit merged 2 commits intodocker-library:masterfrom
yosifkit merged 2 commits intodocker-library:masterfrom
Conversation
Also use --no-install-recommends for all "apt-get install" calls to reduce image size Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Diff for c54457b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8e0d6f6..a4300a6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,49 +2,57 @@ Maintainers: Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)
GitRepo: https://github.com/osrf/docker_images.git
Tags: gzserver7, gzserver7-xenial
-GitCommit: e296cc1a131ef3b2ac62a91d6bf31ab6fb27884d
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/7/ubuntu/xenial/gzserver7
Tags: gzserver9, gzserver9-bionic
-GitCommit: 2f090a032f756498681f948e60711908cfb524d6
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/ubuntu/bionic/gzserver9
Tags: gzserver9-stretch
-GitCommit: e02819ea8bb6838c133d476a7f41f5079836eb4a
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/debian/stretch/gzserver9
Tags: gzserver9-xenial
-GitCommit: 844fe41c654dd84ba291d01620fc11f7ec99c9ad
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/ubuntu/xenial/gzserver9
Tags: gzserver10, gzserver10-bionic
-GitCommit: f1b7ad09fa3bc6b88621c5f4ff2da9669c9ccb3e
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/10/ubuntu/bionic/gzserver10
-Tags: gzserver11, gzserver11-bionic
-GitCommit: bd0ef992496452d93ea929ea5921b123acdab58c
+Tags: gzserver11, gzserver11-focal
+GitCommit: 43e969496f5cabe19dd658c18c85f742bdaf6923
+Directory: gazebo/11/ubuntu/focal/gzserver11
+
+Tags: gzserver11-bionic
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/11/ubuntu/bionic/gzserver11
Tags: libgazebo7, libgazebo7-xenial
-GitCommit: e296cc1a131ef3b2ac62a91d6bf31ab6fb27884d
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/7/ubuntu/xenial/libgazebo7
Tags: libgazebo9, libgazebo9-bionic
-GitCommit: 2f090a032f756498681f948e60711908cfb524d6
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/ubuntu/bionic/libgazebo9
Tags: libgazebo9-stretch
-GitCommit: e02819ea8bb6838c133d476a7f41f5079836eb4a
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/debian/stretch/libgazebo9
Tags: libgazebo9-xenial
-GitCommit: 844fe41c654dd84ba291d01620fc11f7ec99c9ad
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/9/ubuntu/xenial/libgazebo9
Tags: libgazebo10, libgazebo10-bionic
-GitCommit: f1b7ad09fa3bc6b88621c5f4ff2da9669c9ccb3e
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/10/ubuntu/bionic/libgazebo10
-Tags: libgazebo11, libgazebo11-bionic, latest
-GitCommit: bd0ef992496452d93ea929ea5921b123acdab58c
+Tags: libgazebo11, libgazebo11-focal, latest
+GitCommit: 43e969496f5cabe19dd658c18c85f742bdaf6923
+Directory: gazebo/11/ubuntu/focal/libgazebo11
+
+Tags: libgazebo11-bionic
+GitCommit: 6f18102d57b424ce454f61e4ac432e3d6d71f670
Directory: gazebo/11/ubuntu/bionic/libgazebo11
diff --git a/_bashbrew-list b/_bashbrew-list
index fc1ed1d..e0a8b11 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,6 +8,7 @@ gazebo:gzserver10
gazebo:gzserver10-bionic
gazebo:gzserver11
gazebo:gzserver11-bionic
+gazebo:gzserver11-focal
gazebo:latest
gazebo:libgazebo7
gazebo:libgazebo7-xenial
@@ -19,3 +20,4 @@ gazebo:libgazebo10
gazebo:libgazebo10-bionic
gazebo:libgazebo11
gazebo:libgazebo11-bionic
+gazebo:libgazebo11-focal
diff --git a/gazebo_gzserver10-bionic/Dockerfile b/gazebo_gzserver10-bionic/Dockerfile
index d62e8d1..82d86f4 100644
--- a/gazebo_gzserver10-bionic/Dockerfile
+++ b/gazebo_gzserver10-bionic/Dockerfile
@@ -5,10 +5,12 @@ FROM ubuntu:bionic
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
- apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
+ apt-get update && \
+ apt-get install -q -y --no-install-recommends tzdata && \
+ rm -rf /var/lib/apt/lists/*
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -22,7 +24,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo10=10.2.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_gzserver11-bionic/Dockerfile b/gazebo_gzserver11-bionic/Dockerfile
index 054780c..97afa26 100644
--- a/gazebo_gzserver11-bionic/Dockerfile
+++ b/gazebo_gzserver11-bionic/Dockerfile
@@ -5,10 +5,12 @@ FROM ubuntu:bionic
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
- apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
+ apt-get update && \
+ apt-get install -q -y --no-install-recommends tzdata && \
+ rm -rf /var/lib/apt/lists/*
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -22,7 +24,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo11=11.0.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_gzserver11-bionic/Dockerfile b/gazebo_gzserver11-focal/Dockerfile
similarity index 74%
copy from gazebo_gzserver11-bionic/Dockerfile
copy to gazebo_gzserver11-focal/Dockerfile
index 054780c..87b955f 100644
--- a/gazebo_gzserver11-bionic/Dockerfile
+++ b/gazebo_gzserver11-focal/Dockerfile
@@ -1,14 +1,16 @@
# This is an auto generated Dockerfile for gazebo:gzserver11
# generated from docker_images/create_gzserver_image.Dockerfile.em
-FROM ubuntu:bionic
+FROM ubuntu:focal
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
- apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
+ apt-get update && \
+ apt-get install -q -y --no-install-recommends tzdata && \
+ rm -rf /var/lib/apt/lists/*
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -22,8 +24,8 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
- gazebo11=11.0.0-1* \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
+ gazebo11=11.0.0-2* \
&& rm -rf /var/lib/apt/lists/*
# setup environment
diff --git a/gazebo_gzserver10-bionic/gzserver_entrypoint.sh b/gazebo_gzserver11-focal/gzserver_entrypoint.sh
similarity index 100%
copy from gazebo_gzserver10-bionic/gzserver_entrypoint.sh
copy to gazebo_gzserver11-focal/gzserver_entrypoint.sh
diff --git a/gazebo_gzserver7-xenial/Dockerfile b/gazebo_gzserver7-xenial/Dockerfile
index a66cde7..c0554ce 100644
--- a/gazebo_gzserver7-xenial/Dockerfile
+++ b/gazebo_gzserver7-xenial/Dockerfile
@@ -3,7 +3,7 @@
FROM ubuntu:xenial
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -17,7 +17,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo7=7.16.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_gzserver9-bionic/Dockerfile b/gazebo_gzserver9-bionic/Dockerfile
index 66b9be9..756464f 100644
--- a/gazebo_gzserver9-bionic/Dockerfile
+++ b/gazebo_gzserver9-bionic/Dockerfile
@@ -5,10 +5,12 @@ FROM ubuntu:bionic
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
- apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
+ apt-get update && \
+ apt-get install -q -y --no-install-recommends tzdata && \
+ rm -rf /var/lib/apt/lists/*
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -22,7 +24,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo9=9.13.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_gzserver9-stretch/Dockerfile b/gazebo_gzserver9-stretch/Dockerfile
index 0bd4f7e..25b5303 100644
--- a/gazebo_gzserver9-stretch/Dockerfile
+++ b/gazebo_gzserver9-stretch/Dockerfile
@@ -3,7 +3,7 @@
FROM debian:stretch
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -17,7 +17,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo9=9.12.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_gzserver9-xenial/Dockerfile b/gazebo_gzserver9-xenial/Dockerfile
index 883e54f..d594ee5 100644
--- a/gazebo_gzserver9-xenial/Dockerfile
+++ b/gazebo_gzserver9-xenial/Dockerfile
@@ -3,7 +3,7 @@
FROM ubuntu:xenial
# install packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
dirmngr \
gnupg2 \
lsb-release \
@@ -17,7 +17,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
gazebo9=9.13.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_latest/Dockerfile b/gazebo_latest/Dockerfile
index 2ddb16b..8a8799e 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_latest/Dockerfile
@@ -1,7 +1,7 @@
# This is an auto generated Dockerfile for gazebo:libgazebo11
# generated from docker_images/create_gzclient_image.Dockerfile.em
-FROM gazebo:gzserver11-bionic
+FROM gazebo:gzserver11-focal
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
- libgazebo11-dev=11.0.0-1* \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
+ libgazebo11-dev=11.0.0-2* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo10-bionic/Dockerfile b/gazebo_libgazebo10-bionic/Dockerfile
index 44bd58d..50733b5 100644
--- a/gazebo_libgazebo10-bionic/Dockerfile
+++ b/gazebo_libgazebo10-bionic/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver10-bionic
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo10-dev=10.2.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_latest/Dockerfile b/gazebo_libgazebo11-bionic/Dockerfile
similarity index 78%
copy from gazebo_latest/Dockerfile
copy to gazebo_libgazebo11-bionic/Dockerfile
index 2ddb16b..9353967 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_libgazebo11-bionic/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver11-bionic
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo11-dev=11.0.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo7-xenial/Dockerfile b/gazebo_libgazebo7-xenial/Dockerfile
index 1652556..cd7bbc8 100644
--- a/gazebo_libgazebo7-xenial/Dockerfile
+++ b/gazebo_libgazebo7-xenial/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver7-xenial
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo7-dev=7.16.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo9-bionic/Dockerfile b/gazebo_libgazebo9-bionic/Dockerfile
index c0a0d0c..ed46f63 100644
--- a/gazebo_libgazebo9-bionic/Dockerfile
+++ b/gazebo_libgazebo9-bionic/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver9-bionic
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo9-dev=9.13.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo9-stretch/Dockerfile b/gazebo_libgazebo9-stretch/Dockerfile
index 69e511b..569f5f4 100644
--- a/gazebo_libgazebo9-stretch/Dockerfile
+++ b/gazebo_libgazebo9-stretch/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver9-stretch
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo9-dev=9.12.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo9-xenial/Dockerfile b/gazebo_libgazebo9-xenial/Dockerfile
index 2f07890..fa7984c 100644
--- a/gazebo_libgazebo9-xenial/Dockerfile
+++ b/gazebo_libgazebo9-xenial/Dockerfile
@@ -2,6 +2,6 @@
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver9-xenial
# install gazebo packages
-RUN apt-get update && apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
libgazebo9-dev=9.13.0-1* \
&& rm -rf /var/lib/apt/lists/* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also use
--no-install-recommendsfor all"apt-get install" calls to reduce image size
Related to osrf/docker_images#402 and osrf/docker_images#357