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] version bump 7.1.0 -> 7.4.0 #2191

Merged
merged 1 commit into from
Oct 13, 2016

Conversation

ruffsl
Copy link
Contributor

@ruffsl ruffsl commented Sep 26, 2016

and applying apt-get clean template change to all gazebo images

Closes #2183

@tianon
Copy link
Member

tianon commented Sep 26, 2016

warning: insecure protocol git:// detected: git://github.com/osrf/docker_images
diff --git a/gazebo_gzserver4/Dockerfile b/gazebo_gzserver4/Dockerfile
index d388740..71bd616 100644
--- a/gazebo_gzserver4/Dockerfile
+++ b/gazebo_gzserver4/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver4
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-09-26 17:54:29 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -13,7 +13,8 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     gazebo4=4.1.3* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean

 # setup environment
 EXPOSE 11345
diff --git a/gazebo_gzserver5/Dockerfile b/gazebo_gzserver5/Dockerfile
index 021844c..5a8fa72 100644
--- a/gazebo_gzserver5/Dockerfile
+++ b/gazebo_gzserver5/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver5
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-09-26 17:54:25 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -13,7 +13,8 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     gazebo5=5.3.0* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean

 # setup environment
 EXPOSE 11345
diff --git a/gazebo_gzserver6/Dockerfile b/gazebo_gzserver6/Dockerfile
index 35b1c76..c4ceedb 100644
--- a/gazebo_gzserver6/Dockerfile
+++ b/gazebo_gzserver6/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver6
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-09-26 17:54:22 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -13,7 +13,8 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     gazebo6=6.6.0* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean

 # setup environment
 EXPOSE 11345
diff --git a/gazebo_gzserver7/Dockerfile b/gazebo_gzserver7/Dockerfile
index 4ff1d0a..d58f585 100644
--- a/gazebo_gzserver7/Dockerfile
+++ b/gazebo_gzserver7/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver7
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-09-26 17:45:00 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -12,8 +12,9 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas

 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    gazebo7=7.1.0* \
-    && rm -rf /var/lib/apt/lists/*
+    gazebo7=7.3.1* \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean

 # setup environment
 EXPOSE 11345
diff --git a/gazebo_latest/Dockerfile b/gazebo_latest/Dockerfile
index 6650bea..7b86e87 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_latest/Dockerfile
@@ -1,9 +1,10 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo7
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-09-26 17:45:00 +0000
 FROM gazebo:gzserver7
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo7-dev=7.1.0* \
-    && rm -rf /var/lib/apt/lists/*
+    libgazebo7-dev=7.3.1* \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
diff --git a/gazebo_libgazebo4/Dockerfile b/gazebo_libgazebo4/Dockerfile
index 4d6d61a..5e3e5d6 100644
--- a/gazebo_libgazebo4/Dockerfile
+++ b/gazebo_libgazebo4/Dockerfile
@@ -1,9 +1,10 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo4
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-09-26 17:54:29 +0000
 FROM gazebo:gzserver4
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     libgazebo4-dev=4.1.3* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
diff --git a/gazebo_libgazebo5/Dockerfile b/gazebo_libgazebo5/Dockerfile
index 8ce7f12..bb6b452 100644
--- a/gazebo_libgazebo5/Dockerfile
+++ b/gazebo_libgazebo5/Dockerfile
@@ -1,9 +1,10 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo5
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-09-26 17:54:25 +0000
 FROM gazebo:gzserver5
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     libgazebo5-dev=5.3.0* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
diff --git a/gazebo_libgazebo6/Dockerfile b/gazebo_libgazebo6/Dockerfile
index e289590..2cce345 100644
--- a/gazebo_libgazebo6/Dockerfile
+++ b/gazebo_libgazebo6/Dockerfile
@@ -1,9 +1,10 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo6
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-09-26 17:54:22 +0000
 FROM gazebo:gzserver6
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
     libgazebo6-dev=6.6.0* \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean

@tianon
Copy link
Member

tianon commented Sep 26, 2016

Is that apt-get clean actually removing anything for you? (Not keeping any .deb files on-disk should already be implied by the configuration in the base images.)

See especially https://github.com/tianon/docker-brew-ubuntu-core/blob/29349edf0456a8644d5d7a2965bc8e9cfab5302b/trusty/Dockerfile#L21-L24, which comes from https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap#L85-L105.

@ruffsl
Copy link
Contributor Author

ruffsl commented Sep 26, 2016

Looks like it was introduced in this PR: osrf/docker_templates#9
@esteve , Do you remember what caused you to add apt-get clean, or what else it's doing that wasn't being done by the base image. Perhaps it wasn't clear that the base image was already adjusted for this? I'm just unsure.

@esteve
Copy link

esteve commented Oct 12, 2016

@ruffsl I must have seen the .deb files in another container, and wrongly assumed it was one that ran these images. I didn't know the images had an API policy that removed the .deb files after fetching them. Sorry for submitting an incorrect PR, I just created another one that reverts those changes. See osrf/docker_templates#10

@ruffsl ruffsl force-pushed the gazebo branch 2 times, most recently from 71b75c0 to fb567f8 Compare October 13, 2016 17:26
@ruffsl
Copy link
Contributor Author

ruffsl commented Oct 13, 2016

Ok, I've rebased the PR with just the version bump and reverted the apt-get clean change.
@tianon , Let me know if it's all good.

@yosifkit
Copy link
Member

Looks fine to me!

diff --git a/gazebo_gzserver4/Dockerfile b/gazebo_gzserver4/Dockerfile
index d388740..33fd678 100644
--- a/gazebo_gzserver4/Dockerfile
+++ b/gazebo_gzserver4/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver4
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-10-13 17:16:11 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver5/Dockerfile b/gazebo_gzserver5/Dockerfile
index 021844c..c6019c4 100644
--- a/gazebo_gzserver5/Dockerfile
+++ b/gazebo_gzserver5/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver5
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-10-13 17:16:17 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver6/Dockerfile b/gazebo_gzserver6/Dockerfile
index 35b1c76..6cd451e 100644
--- a/gazebo_gzserver6/Dockerfile
+++ b/gazebo_gzserver6/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver6
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-10-13 17:16:22 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver7/Dockerfile b/gazebo_gzserver7/Dockerfile
index 4ff1d0a..810f349 100644
--- a/gazebo_gzserver7/Dockerfile
+++ b/gazebo_gzserver7/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver7
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-10-13 17:16:25 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -12,7 +12,7 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas

 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    gazebo7=7.1.0* \
+    gazebo7=7.3.1* \
     && rm -rf /var/lib/apt/lists/*

 # setup environment
diff --git a/gazebo_latest/Dockerfile b/gazebo_latest/Dockerfile
index 6650bea..46cdf88 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_latest/Dockerfile
@@ -1,9 +1,9 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo7
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-10-13 17:16:25 +0000
 FROM gazebo:gzserver7
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo7-dev=7.1.0* \
+    libgazebo7-dev=7.3.1* \
     && rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo4/Dockerfile b/gazebo_libgazebo4/Dockerfile
index 4d6d61a..d7801a6 100644
--- a/gazebo_libgazebo4/Dockerfile
+++ b/gazebo_libgazebo4/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo4
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-10-13 17:16:11 +0000
 FROM gazebo:gzserver4
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
diff --git a/gazebo_libgazebo5/Dockerfile b/gazebo_libgazebo5/Dockerfile
index 8ce7f12..50f1261 100644
--- a/gazebo_libgazebo5/Dockerfile
+++ b/gazebo_libgazebo5/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo5
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-10-13 17:16:17 +0000
 FROM gazebo:gzserver5
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
diff --git a/gazebo_libgazebo6/Dockerfile b/gazebo_libgazebo6/Dockerfile
index e289590..370c336 100644
--- a/gazebo_libgazebo6/Dockerfile
+++ b/gazebo_libgazebo6/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo6
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-10-13 17:16:22 +0000
 FROM gazebo:gzserver6
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages

@yosifkit
Copy link
Member

I'm getting build failure on gazebo7 images: Version '7.3.1*' for 'gazebo7', 'libgazebo7-dev' was not found

$ bashbrew build gazebo:gzserver7
Building bashbrew/cache:910fd0a6b5edec7e3105d2753df2a3e11d1674f60fef1fff334710e3fb514b26 (gazebo:gzserver7)
error: failed building "gazebo" (tags "gzserver7")
exit status 1
docker ["build" "-t" "bashbrew/cache:910fd0a6b5edec7e3105d2753df2a3e11d1674f60fef1fff334710e3fb514b26" "--rm" "--force-rm" "-"] output:
Sending build context to Docker daemon 10.24 kB
Step 1 : FROM ubuntu:trusty
 ---> ff703629a711
Step 2 : MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 ---> Using cache
 ---> 75e2f973ee46
Step 3 : RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
 ---> Using cache
 ---> d828b86858f9
Step 4 : RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list
 ---> Using cache
 ---> 2bb696e0842e
Step 5 : RUN apt-get update && apt-get install -q -y     gazebo7=7.3.1*     && rm -rf /var/lib/apt/lists/*
 ---> Running in 0a5d6ea1231d
Get:1 http://packages.osrfoundation.org trusty InRelease [4258 B]
Ign http://archive.ubuntu.com trusty InRelease
Get:2 http://archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Get:3 http://archive.ubuntu.com trusty-security InRelease [65.9 kB]
Get:4 http://archive.ubuntu.com trusty Release.gpg [933 B]
Get:5 http://archive.ubuntu.com trusty Release [58.5 kB]
Get:6 http://packages.osrfoundation.org trusty/main amd64 Packages [39.6 kB]
Get:7 http://archive.ubuntu.com trusty-updates/main Sources [475 kB]
Get:8 http://archive.ubuntu.com trusty-updates/restricted Sources [5247 B]
Get:9 http://archive.ubuntu.com trusty-updates/universe Sources [213 kB]
Get:10 http://archive.ubuntu.com trusty-updates/main amd64 Packages [1131 kB]
Get:11 http://archive.ubuntu.com trusty-updates/restricted amd64 Packages [23.5 kB]
Get:12 http://archive.ubuntu.com trusty-updates/universe amd64 Packages [501 kB]
Get:13 http://archive.ubuntu.com trusty-security/main Sources [153 kB]
Get:14 http://archive.ubuntu.com trusty-security/restricted Sources [3944 B]
Get:15 http://archive.ubuntu.com trusty-security/universe Sources [52.1 kB]
Get:16 http://archive.ubuntu.com trusty-security/main amd64 Packages [668 kB]
Get:17 http://archive.ubuntu.com trusty-security/restricted amd64 Packages [20.2 kB]
Get:18 http://archive.ubuntu.com trusty-security/universe amd64 Packages [183 kB]
Get:19 http://archive.ubuntu.com trusty/main Sources [1335 kB]
Get:20 http://archive.ubuntu.com trusty/restricted Sources [5335 B]
Get:21 http://archive.ubuntu.com trusty/universe Sources [7926 kB]
Get:22 http://archive.ubuntu.com trusty/main amd64 Packages [1743 kB]
Get:23 http://archive.ubuntu.com trusty/restricted amd64 Packages [16.0 kB]
Get:24 http://archive.ubuntu.com trusty/universe amd64 Packages [7589 kB]
Fetched 22.3 MB in 5s (4237 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
E: Version '7.3.1*' for 'gazebo7' was not found
Removing intermediate container 0a5d6ea1231d
The command '/bin/sh -c apt-get update && apt-get install -q -y     gazebo7=7.3.1*     && rm -rf /var/lib/apt/lists/*' returned a non-zero code: 100



$ bashbrew build gazebo:libgazebo7
Building bashbrew/cache:a73dc351433ce9bd4f6e1a80ffc0b730330ea400cf2827983d79b1a7476faad6 (gazebo:libgazebo7)
error: failed building "gazebo" (tags "libgazebo7, latest")
exit status 1
docker ["build" "-t" "bashbrew/cache:a73dc351433ce9bd4f6e1a80ffc0b730330ea400cf2827983d79b1a7476faad6" "--rm" "--force-rm" "-"] output:
Sending build context to Docker daemon 10.24 kB
Step 1 : FROM gazebo:gzserver7
 ---> 7df1f9bb8d4d
Step 2 : MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 ---> Running in adb1aa7faf99
 ---> 705bec7a60c0
Removing intermediate container adb1aa7faf99
Step 3 : RUN apt-get update && apt-get install -q -y     libgazebo7-dev=7.3.1*     && rm -rf /var/lib/apt/lists/*
 ---> Running in ec412aaeeb8f
Get:1 http://packages.osrfoundation.org trusty InRelease [4258 B]
Ign http://archive.ubuntu.com trusty InRelease
Get:2 http://archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Get:3 http://archive.ubuntu.com trusty-security InRelease [65.9 kB]
Get:4 http://archive.ubuntu.com trusty Release.gpg [933 B]
Get:5 http://packages.osrfoundation.org trusty/main amd64 Packages [39.6 kB]
Get:6 http://archive.ubuntu.com trusty Release [58.5 kB]
Get:7 http://archive.ubuntu.com trusty-updates/main Sources [475 kB]
Get:8 http://archive.ubuntu.com trusty-updates/restricted Sources [5247 B]
Get:9 http://archive.ubuntu.com trusty-updates/universe Sources [213 kB]
Get:10 http://archive.ubuntu.com trusty-updates/main amd64 Packages [1131 kB]
Get:11 http://archive.ubuntu.com trusty-updates/restricted amd64 Packages [23.5 kB]
Get:12 http://archive.ubuntu.com trusty-updates/universe amd64 Packages [501 kB]
Get:13 http://archive.ubuntu.com trusty-security/main Sources [153 kB]
Get:14 http://archive.ubuntu.com trusty-security/restricted Sources [3944 B]
Get:15 http://archive.ubuntu.com trusty-security/universe Sources [52.1 kB]
Get:16 http://archive.ubuntu.com trusty-security/main amd64 Packages [668 kB]
Get:17 http://archive.ubuntu.com trusty-security/restricted amd64 Packages [20.2 kB]
Get:18 http://archive.ubuntu.com trusty-security/universe amd64 Packages [183 kB]
Get:19 http://archive.ubuntu.com trusty/main Sources [1335 kB]
Get:20 http://archive.ubuntu.com trusty/restricted Sources [5335 B]
Get:21 http://archive.ubuntu.com trusty/universe Sources [7926 kB]
Get:22 http://archive.ubuntu.com trusty/main amd64 Packages [1743 kB]
Get:23 http://archive.ubuntu.com trusty/restricted amd64 Packages [16.0 kB]
Get:24 http://archive.ubuntu.com trusty/universe amd64 Packages [7589 kB]
Fetched 22.3 MB in 5s (4366 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
E: Version '7.3.1*' for 'libgazebo7-dev' was not found
Removing intermediate container ec412aaeeb8f
The command '/bin/sh -c apt-get update && apt-get install -q -y     libgazebo7-dev=7.3.1*     && rm -rf /var/lib/apt/lists/*' returned a non-zero code: 100

@ruffsl ruffsl changed the title [Gazebo] version bump 7.1.0 -> 7.3.1 [Gazebo] version bump 7.1.0 -> 7.4.0 Oct 13, 2016
@ruffsl
Copy link
Contributor Author

ruffsl commented Oct 13, 2016

Looks like new version was released in between the time I first made the PR. Fixed and rebased.

@scpeters , Do you think it would be possible to scrape the OSRF's package index (like the one for trusty here ) to determine the latest package version released? I made such an equvelent modification for ROS's generation script.

It would be nice to have one for gazebo so that when maintainers auto-generate the Dockerfiles, they can rely on them being up-to-date, as it seems that gazebo updates relatively frequently. I tried to see if there was a native pythonic way, but didn't find much at the time ( relevant stackoverflow ), but perhaps the same could be done by just parsing the text from the url and looking up the version for a key & value paring. My only concern with that is the url request would not be over https. @tfoote , perhaps that osrf doming could use an SSL certificate?

@yosifkit
Copy link
Member

New diff:

diff --git a/gazebo_gzserver4/Dockerfile b/gazebo_gzserver4/Dockerfile
index d388740..33fd678 100644
--- a/gazebo_gzserver4/Dockerfile
+++ b/gazebo_gzserver4/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver4
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-10-13 17:16:11 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver5/Dockerfile b/gazebo_gzserver5/Dockerfile
index 021844c..c6019c4 100644
--- a/gazebo_gzserver5/Dockerfile
+++ b/gazebo_gzserver5/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver5
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-10-13 17:16:17 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver6/Dockerfile b/gazebo_gzserver6/Dockerfile
index 35b1c76..6cd451e 100644
--- a/gazebo_gzserver6/Dockerfile
+++ b/gazebo_gzserver6/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver6
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-10-13 17:16:22 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

diff --git a/gazebo_gzserver7/Dockerfile b/gazebo_gzserver7/Dockerfile
index 4ff1d0a..7535cc3 100644
--- a/gazebo_gzserver7/Dockerfile
+++ b/gazebo_gzserver7/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:gzserver7
 # generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-10-13 21:36:43 +0000
 FROM ubuntu:trusty
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org

@@ -12,7 +12,7 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_releas

 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    gazebo7=7.1.0* \
+    gazebo7=7.4.0* \
     && rm -rf /var/lib/apt/lists/*

 # setup environment
diff --git a/gazebo_latest/Dockerfile b/gazebo_latest/Dockerfile
index 6650bea..d60519e 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_latest/Dockerfile
@@ -1,9 +1,9 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo7
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:08 +0000
+# generated on 2016-10-13 21:36:43 +0000
 FROM gazebo:gzserver7
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
 RUN apt-get update && apt-get install -q -y \
-    libgazebo7-dev=7.1.0* \
+    libgazebo7-dev=7.4.0* \
     && rm -rf /var/lib/apt/lists/*
diff --git a/gazebo_libgazebo4/Dockerfile b/gazebo_libgazebo4/Dockerfile
index 4d6d61a..d7801a6 100644
--- a/gazebo_libgazebo4/Dockerfile
+++ b/gazebo_libgazebo4/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo4
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-26 23:19:42 +0000
+# generated on 2016-10-13 17:16:11 +0000
 FROM gazebo:gzserver4
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
diff --git a/gazebo_libgazebo5/Dockerfile b/gazebo_libgazebo5/Dockerfile
index 8ce7f12..50f1261 100644
--- a/gazebo_libgazebo5/Dockerfile
+++ b/gazebo_libgazebo5/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo5
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:00 +0000
+# generated on 2016-10-13 17:16:17 +0000
 FROM gazebo:gzserver5
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages
diff --git a/gazebo_libgazebo6/Dockerfile b/gazebo_libgazebo6/Dockerfile
index e289590..370c336 100644
--- a/gazebo_libgazebo6/Dockerfile
+++ b/gazebo_libgazebo6/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for gazebo:libgazebo6
 # generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2016-04-27 20:25:03 +0000
+# generated on 2016-10-13 17:16:22 +0000
 FROM gazebo:gzserver6
 MAINTAINER Steven Peters scpeters+buildfarm@osrfoundation.org
 # install gazebo packages

@scpeters
Copy link
Contributor

Scraping the package index should work fine. Also, we use a python script for releasing our gazebo code (similar to bloom I guess), and that could trigger the docker images update if you want. In the past year, we added a trigger to this script to update homebrew formulae when a new package is released:

@yosifkit
Copy link
Member

Build test of #2191; deeeb18 (gazebo):

$ bashbrew build gazebo:gzserver4
warning: insecure protocol git:// detected: git://github.com/osrf/docker_images
Building bashbrew/cache:6409c24ee44957ece583fc4e84f924095ac75959f5194e293e6f1e34038b6aee (gazebo:gzserver4)
Tagging gazebo:gzserver4

$ test/run.sh gazebo:gzserver4
testing gazebo:gzserver4
    '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:libgazebo4
Building bashbrew/cache:e41d65c294ba541164d323f4b61d8773dbd065ac0ce5825f7c0ad0f4783ba97a (gazebo:libgazebo4)
Tagging gazebo:libgazebo4

$ test/run.sh gazebo:libgazebo4
testing gazebo:libgazebo4
    '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:gzserver5
Building bashbrew/cache:9955cbc542194dc5679d5df674a185d07e530f2c8974fc55fe8ed7bdd6e63ae4 (gazebo:gzserver5)
Tagging gazebo:gzserver5

$ test/run.sh gazebo:gzserver5
testing gazebo:gzserver5
    '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:libgazebo5
Building bashbrew/cache:d8ac1b3d1cfb432b7cc77caf5efc0856533e1650244ff97cd4f5cb7f2e4499a5 (gazebo:libgazebo5)
Tagging gazebo:libgazebo5

$ test/run.sh gazebo:libgazebo5
testing gazebo:libgazebo5
    '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:gzserver6
Building bashbrew/cache:442d0083cdcd811b6e03d0c908e573464fd11d4ff524896e73c3fce2eb5130ea (gazebo:gzserver6)
Tagging gazebo:gzserver6

$ test/run.sh gazebo:gzserver6
testing gazebo:gzserver6
    '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:libgazebo6
Building bashbrew/cache:28540f597d2f33802adffcc81ea67afcf6b0e8f3ce9d16329f781a9a2920aa63 (gazebo:libgazebo6)
Tagging gazebo:libgazebo6

$ test/run.sh gazebo:libgazebo6
testing gazebo:libgazebo6
    '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:gzserver7
Building bashbrew/cache:3b0a0e4408fcd1549b52980480861e43875aa4a0af1080e2bc8f9a1f382e7726 (gazebo:gzserver7)
Tagging gazebo:gzserver7

$ 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:90fb1eb0248dd05451ab985d9565a9e1f74e4c4aefb737ef4030e8c1213bcdaa (gazebo:libgazebo7)
Tagging gazebo:libgazebo7
Tagging gazebo:latest

$ 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

@yosifkit yosifkit merged commit 073790f into docker-library:master Oct 13, 2016
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.

6 participants