Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gazebo] retiring gazebo 7, 10 and gazebo9 on debian stretch #10062

Merged

Conversation

mikaelarguedas
Copy link
Contributor

Gazebo 7 and 10 became EOL in early 2021, we can stop building the corresponding images

also bumping gazebo 9 from 9.16.0 to 9.17.0 on ubuntu

also bumping gazebo 9 from 9.16.0 to 9.17.0 on ubuntu

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
@github-actions
Copy link

Diff for be922ef:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 80d92ef..6fd2779 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,26 +1,14 @@
 Maintainers: Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)
 GitRepo: https://github.com/osrf/docker_images.git
 
-Tags: gzserver7, gzserver7-xenial
-GitCommit: c2b11f03428e862ab6c8f106823fac7d9d9ac48c
-Directory: gazebo/7/ubuntu/xenial/gzserver7
-
 Tags: gzserver9, gzserver9-bionic
-GitCommit: 14c917e2aba1d985be1d62672669a577c0cc2eaa
+GitCommit: 7178a9d0d509c8c222fffa6edff4d84124fb46ee
 Directory: gazebo/9/ubuntu/bionic/gzserver9
 
-Tags: gzserver9-stretch
-GitCommit: a6c5b63e1ba4291e94b91ac5ff067c0d3f7d3c37
-Directory: gazebo/9/debian/stretch/gzserver9
-
 Tags: gzserver9-xenial
-GitCommit: d521594aab0f506c90998ab79bc4dbc9c20e39b8
+GitCommit: c1a6cab08c9a8b85c869d24b31f6243ad4646cee
 Directory: gazebo/9/ubuntu/xenial/gzserver9
 
-Tags: gzserver10, gzserver10-bionic
-GitCommit: c2b11f03428e862ab6c8f106823fac7d9d9ac48c
-Directory: gazebo/10/ubuntu/bionic/gzserver10
-
 Tags: gzserver11, gzserver11-focal
 GitCommit: 163a37c8a124c3e46872f7904c0fddf251d81160
 Directory: gazebo/11/ubuntu/focal/gzserver11
@@ -29,26 +17,14 @@ Tags: gzserver11-bionic
 GitCommit: 48051c3f57c5c632407920a4beec2c2953f1b6f5
 Directory: gazebo/11/ubuntu/bionic/gzserver11
 
-Tags: libgazebo7, libgazebo7-xenial
-GitCommit: c2b11f03428e862ab6c8f106823fac7d9d9ac48c
-Directory: gazebo/7/ubuntu/xenial/libgazebo7
-
 Tags: libgazebo9, libgazebo9-bionic
-GitCommit: 14c917e2aba1d985be1d62672669a577c0cc2eaa
+GitCommit: 7178a9d0d509c8c222fffa6edff4d84124fb46ee
 Directory: gazebo/9/ubuntu/bionic/libgazebo9
 
-Tags: libgazebo9-stretch
-GitCommit: a6c5b63e1ba4291e94b91ac5ff067c0d3f7d3c37
-Directory: gazebo/9/debian/stretch/libgazebo9
-
 Tags: libgazebo9-xenial
-GitCommit: d521594aab0f506c90998ab79bc4dbc9c20e39b8
+GitCommit: c1a6cab08c9a8b85c869d24b31f6243ad4646cee
 Directory: gazebo/9/ubuntu/xenial/libgazebo9
 
-Tags: libgazebo10, libgazebo10-bionic
-GitCommit: c2b11f03428e862ab6c8f106823fac7d9d9ac48c
-Directory: gazebo/10/ubuntu/bionic/libgazebo10
-
 Tags: libgazebo11, libgazebo11-focal, latest
 GitCommit: 163a37c8a124c3e46872f7904c0fddf251d81160
 Directory: gazebo/11/ubuntu/focal/libgazebo11
diff --git a/_bashbrew-list b/_bashbrew-list
index e0a8b11..6f4a288 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,23 +1,13 @@
-gazebo:gzserver7
-gazebo:gzserver7-xenial
 gazebo:gzserver9
 gazebo:gzserver9-bionic
-gazebo:gzserver9-stretch
 gazebo:gzserver9-xenial
-gazebo:gzserver10
-gazebo:gzserver10-bionic
 gazebo:gzserver11
 gazebo:gzserver11-bionic
 gazebo:gzserver11-focal
 gazebo:latest
-gazebo:libgazebo7
-gazebo:libgazebo7-xenial
 gazebo:libgazebo9
 gazebo:libgazebo9-bionic
-gazebo:libgazebo9-stretch
 gazebo:libgazebo9-xenial
-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
deleted file mode 100644
index f135c9e..0000000
diff --git a/gazebo_gzserver10-bionic/gzserver_entrypoint.sh b/gazebo_gzserver10-bionic/gzserver_entrypoint.sh
deleted file mode 100755
index 3fd6668..0000000
diff --git a/gazebo_gzserver7-xenial/Dockerfile b/gazebo_gzserver7-xenial/Dockerfile
deleted file mode 100644
index b7d2eec..0000000
diff --git a/gazebo_gzserver7-xenial/gzserver_entrypoint.sh b/gazebo_gzserver7-xenial/gzserver_entrypoint.sh
deleted file mode 100755
index 3fd6668..0000000
diff --git a/gazebo_gzserver9-bionic/Dockerfile b/gazebo_gzserver9-bionic/Dockerfile
index 39fd192..1c0b52c 100644
--- a/gazebo_gzserver9-bionic/Dockerfile
+++ b/gazebo_gzserver9-bionic/Dockerfile
@@ -25,7 +25,7 @@ RUN . /etc/os-release \
 
 # install gazebo packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    gazebo9=9.16.0-1* \
+    gazebo9=9.17.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/gazebo_gzserver9-stretch/Dockerfile b/gazebo_gzserver9-stretch/Dockerfile
deleted file mode 100644
index 2fd815d..0000000
diff --git a/gazebo_gzserver9-stretch/gzserver_entrypoint.sh b/gazebo_gzserver9-stretch/gzserver_entrypoint.sh
deleted file mode 100755
index 3fd6668..0000000
diff --git a/gazebo_gzserver9-xenial/Dockerfile b/gazebo_gzserver9-xenial/Dockerfile
index ddc22b6..5367459 100644
--- a/gazebo_gzserver9-xenial/Dockerfile
+++ b/gazebo_gzserver9-xenial/Dockerfile
@@ -18,7 +18,7 @@ RUN . /etc/os-release \
 
 # install gazebo packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    gazebo9=9.16.0-1* \
+    gazebo9=9.17.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/gazebo_libgazebo10-bionic/Dockerfile b/gazebo_libgazebo10-bionic/Dockerfile
deleted file mode 100644
index aa7838f..0000000
diff --git a/gazebo_libgazebo7-xenial/Dockerfile b/gazebo_libgazebo7-xenial/Dockerfile
deleted file mode 100644
index 7f09bf7..0000000
diff --git a/gazebo_libgazebo9-bionic/Dockerfile b/gazebo_libgazebo9-bionic/Dockerfile
index 260126c..5c8d6bd 100644
--- a/gazebo_libgazebo9-bionic/Dockerfile
+++ b/gazebo_libgazebo9-bionic/Dockerfile
@@ -4,6 +4,6 @@ FROM gazebo:gzserver9-bionic
 
 # install gazebo packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libgazebo9-dev=9.16.0-1* \
+    libgazebo9-dev=9.17.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/gazebo_libgazebo9-stretch/Dockerfile b/gazebo_libgazebo9-stretch/Dockerfile
deleted file mode 100644
index 39c9c26..0000000
diff --git a/gazebo_libgazebo9-xenial/Dockerfile b/gazebo_libgazebo9-xenial/Dockerfile
index 8008d08..763840b 100644
--- a/gazebo_libgazebo9-xenial/Dockerfile
+++ b/gazebo_libgazebo9-xenial/Dockerfile
@@ -4,6 +4,6 @@ FROM gazebo:gzserver9-xenial
 
 # install gazebo packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libgazebo9-dev=9.16.0-1* \
+    libgazebo9-dev=9.17.0-1* \
     && rm -rf /var/lib/apt/lists/*
 

@yosifkit yosifkit merged commit fe0813b into docker-library:master Apr 28, 2021
@mikaelarguedas mikaelarguedas deleted the retiring-eol-gazebo branch April 29, 2021 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants