Add rethinkdb image
Update apache image