4904: Handle failure to delete non-existent cidfile. Fix docker_image in sample...

diff --git a/services/arv-web/arv-web.py b/services/arv-web/arv-web.py
index 129e0fb762b9df5171f1a97009a29f275b38f37d..98ea34d7a7b477c7eb972cf1608f2c73b3a7591e 100755 (executable)
--- a/services/arv-web/arv-web.py
+++ b/services/arv-web/arv-web.py
@@ -140,8 +140,11 @@ def main(argv):
                                             cid = cidfile.read().strip()
                                     except IOError:
                                         pass
-                                os.unlink(cidfilepath)
-                                os.rmdir(ciddir)
+                                try:
+                                    os.unlink(cidfilepath)
+                                    os.rmdir(ciddir)
+                                except OSError:
+                                    pass
 
                                 prev_docker_image = docker_image
                                 logger.info("Container id %s", cid)

diff --git a/services/arv-web/sample-static-page/docker_image b/services/arv-web/sample-static-page/docker_image
index d11310422e9b8f4be7b1efd27f1a658259093ec1..57f344fcd7f271cbf2e1c8948079a3851828eabe 100644 (file)
--- a/services/arv-web/sample-static-page/docker_image
+++ b/services/arv-web/sample-static-page/docker_image
@@ -1 +1 @@
-arvados/arv-job
\ No newline at end of file
+arvados/arv-web
\ No newline at end of file