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] EOL v8 and version bump v9 #5573

Merged
merged 1 commit into from
Mar 20, 2019

Conversation

ruffsl
Copy link
Contributor

@ruffsl ruffsl commented Mar 19, 2019

@tianon
Copy link
Member

tianon commented Mar 20, 2019

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 47f90a0..0f52e69 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,5 +1,4 @@
 gazebo:gzserver7-xenial @ amd64
-gazebo:gzserver8-xenial @ amd64
 gazebo:gzserver9-bionic @ amd64
 gazebo:gzserver9-bionic @ arm32v7
 gazebo:gzserver9-bionic @ arm64v8
@@ -14,7 +13,6 @@ gazebo:latest @ amd64
 gazebo:latest @ arm32v7
 gazebo:latest @ arm64v8
 gazebo:libgazebo7-xenial @ amd64
-gazebo:libgazebo8-xenial @ amd64
 gazebo:libgazebo9-bionic @ amd64
 gazebo:libgazebo9-bionic @ arm32v7
 gazebo:libgazebo9-bionic @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 0ce879c..593a48a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,5 @@
 gazebo:gzserver7
 gazebo:gzserver7-xenial
-gazebo:gzserver8
-gazebo:gzserver8-xenial
 gazebo:gzserver9
 gazebo:gzserver9-bionic
 gazebo:gzserver9-stretch
@@ -11,8 +9,6 @@ gazebo:gzserver10-bionic
 gazebo:latest
 gazebo:libgazebo7
 gazebo:libgazebo7-xenial
-gazebo:libgazebo8
-gazebo:libgazebo8-xenial
 gazebo:libgazebo9
 gazebo:libgazebo9-bionic
 gazebo:libgazebo9-stretch
diff --git a/gazebo_gzserver8-xenial/Dockerfile b/gazebo_gzserver8-xenial/Dockerfile
deleted file mode 100644
index e3c7d39..0000000
diff --git a/gazebo_gzserver8-xenial/gzserver_entrypoint.sh b/gazebo_gzserver8-xenial/gzserver_entrypoint.sh
deleted file mode 100755
index 3fd6668..0000000
diff --git a/gazebo_gzserver9-bionic/Dockerfile b/gazebo_gzserver9-bionic/Dockerfile
index b49e498..ef77dc4 100644
--- a/gazebo_gzserver9-bionic/Dockerfile
+++ b/gazebo_gzserver9-bionic/Dockerfile
@@ -23,7 +23,7 @@ RUN . /etc/os-release \
 
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    gazebo9=9.6.0-1* \
+    gazebo9=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/gazebo_gzserver9-stretch/Dockerfile b/gazebo_gzserver9-stretch/Dockerfile
index a6f2e67..74a2827 100644
--- a/gazebo_gzserver9-stretch/Dockerfile
+++ b/gazebo_gzserver9-stretch/Dockerfile
@@ -18,7 +18,7 @@ RUN . /etc/os-release \
 
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    gazebo9=9.6.0-1* \
+    gazebo9=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/gazebo_gzserver9-xenial/Dockerfile b/gazebo_gzserver9-xenial/Dockerfile
index 8bc575e..7241e69 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 -q -y \
-    gazebo9=9.6.0-1* \
+    gazebo9=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/gazebo_libgazebo8-xenial/Dockerfile b/gazebo_libgazebo8-xenial/Dockerfile
deleted file mode 100644
index f5beec8..0000000
diff --git a/gazebo_libgazebo9-bionic/Dockerfile b/gazebo_libgazebo9-bionic/Dockerfile
index 56755c0..e18f823 100644
--- a/gazebo_libgazebo9-bionic/Dockerfile
+++ b/gazebo_libgazebo9-bionic/Dockerfile
@@ -3,5 +3,5 @@
 FROM gazebo:gzserver9-bionic
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo9-dev=9.6.0-1* \
+    libgazebo9-dev=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo9-stretch/Dockerfile b/gazebo_libgazebo9-stretch/Dockerfile
index cea0e03..e0f6ee7 100644
--- a/gazebo_libgazebo9-stretch/Dockerfile
+++ b/gazebo_libgazebo9-stretch/Dockerfile
@@ -3,5 +3,5 @@
 FROM gazebo:gzserver9-stretch
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo9-dev=9.6.0-1* \
+    libgazebo9-dev=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo9-xenial/Dockerfile b/gazebo_libgazebo9-xenial/Dockerfile
index 389cb7c..860ffcf 100644
--- a/gazebo_libgazebo9-xenial/Dockerfile
+++ b/gazebo_libgazebo9-xenial/Dockerfile
@@ -3,5 +3,5 @@
 FROM gazebo:gzserver9-xenial
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo9-dev=9.6.0-1* \
+    libgazebo9-dev=9.7.0-1* \
     && rm -rf /var/lib/apt/lists/*

@tianon
Copy link
Member

tianon commented Mar 20, 2019

LGTM

Build test of #5573; 250d144; amd64 (gazebo):

$ bashbrew build gazebo:gzserver7
Building bashbrew/cache:0b7b30c12b33ec251cb56646aab85fa841c6d82e1f7198c7522f3a4b3ca58b8c (gazebo:gzserver7)
Tagging gazebo:gzserver7
Tagging gazebo:gzserver7-xenial

$ test/run.sh gazebo:gzserver7
testing gazebo:gzserver7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:libgazebo7
Building bashbrew/cache:04cf08b78fe19bd73ba3a050dfa8d23233f2a61e9257cd00d66564e27699ebca (gazebo:libgazebo7)
Tagging gazebo:libgazebo7
Tagging gazebo:libgazebo7-xenial

$ test/run.sh gazebo:libgazebo7
testing gazebo:libgazebo7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:gzserver9-xenial
Building bashbrew/cache:19053dd8e235b4c5391857e766b9caab75dd8e358a9f05e9faeb81c7270207a3 (gazebo:gzserver9-xenial)
Tagging gazebo:gzserver9-xenial

$ test/run.sh gazebo:gzserver9-xenial
testing gazebo:gzserver9-xenial
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:libgazebo9-xenial
Building bashbrew/cache:5edeef8e8357ac9c0280f3f432335171ff43455822b997a9c983ddfd7d966c1a (gazebo:libgazebo9-xenial)
Tagging gazebo:libgazebo9-xenial

$ test/run.sh gazebo:libgazebo9-xenial
testing gazebo:libgazebo9-xenial
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:gzserver9
Building bashbrew/cache:1d2afb1acc57a2eeed291c2a2c3de1cbfecf56376b530eaa8b590fbe832f1a69 (gazebo:gzserver9)
Tagging gazebo:gzserver9
Tagging gazebo:gzserver9-bionic

$ test/run.sh gazebo:gzserver9
testing gazebo:gzserver9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:libgazebo9
Building bashbrew/cache:74c0448dfa33b42890722b9a3704546a2c727a5951596145c4c057e43211a7b8 (gazebo:libgazebo9)
Tagging gazebo:libgazebo9
Tagging gazebo:libgazebo9-bionic

$ test/run.sh gazebo:libgazebo9
testing gazebo:libgazebo9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:gzserver9-stretch
Building bashbrew/cache:51c286bd44645cdb1360b4b08d0058cdd21f6c12e8a878815f1f2dda90a76448 (gazebo:gzserver9-stretch)
Tagging gazebo:gzserver9-stretch

$ test/run.sh gazebo:gzserver9-stretch
testing gazebo:gzserver9-stretch
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:libgazebo9-stretch
Building bashbrew/cache:f53cd6ebddc9f68136f07055ab70f14a9b14cf8a1872b24c463fad3b0e6e91de (gazebo:libgazebo9-stretch)
Tagging gazebo:libgazebo9-stretch

$ test/run.sh gazebo:libgazebo9-stretch
testing gazebo:libgazebo9-stretch
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:gzserver10
Building bashbrew/cache:efbdf0605b7b9472100f6ac7c363d7b4d118d8f5df9b34f84692b4c83d28f6e6 (gazebo:gzserver10)
Tagging gazebo:gzserver10
Tagging gazebo:gzserver10-bionic

$ test/run.sh gazebo:gzserver10
testing gazebo:gzserver10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gazebo:libgazebo10
Building bashbrew/cache:d7c7cb77d4f1d156baa36982f9d38bedf7fe921ed7cf820e3791a47c9018d2e4 (gazebo:libgazebo10)
Tagging gazebo:libgazebo10
Tagging gazebo:libgazebo10-bionic
Tagging gazebo:latest

$ test/run.sh gazebo:libgazebo10
testing gazebo:libgazebo10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit bb49105 into docker-library:master Mar 20, 2019
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.

None yet

3 participants