From 3cc63065a7833295ea3392e71443d195872e485e Mon Sep 17 00:00:00 2001 From: Ollie Philpott Date: Mon, 22 Jun 2020 14:41:11 +0100 Subject: [PATCH 1/5] update docker images --- selenium-node-chrome-debug/Dockerfile | 2 +- selenium-node-chrome/Dockerfile | 2 +- selenium-node-firefox-debug/Dockerfile | 2 +- selenium-node-firefox/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selenium-node-chrome-debug/Dockerfile b/selenium-node-chrome-debug/Dockerfile index 2116572..f694152 100644 --- a/selenium-node-chrome-debug/Dockerfile +++ b/selenium-node-chrome-debug/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-chrome-debug +FROM selenium/node-chrome-debug:3.141.59 ENV HOME=/home/seluser diff --git a/selenium-node-chrome/Dockerfile b/selenium-node-chrome/Dockerfile index b103fc0..6cf4963 100644 --- a/selenium-node-chrome/Dockerfile +++ b/selenium-node-chrome/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-chrome:3.6.0 +FROM selenium/node-chrome:3.141.59 ENV HOME=/home/seluser diff --git a/selenium-node-firefox-debug/Dockerfile b/selenium-node-firefox-debug/Dockerfile index b61f3fb..34ff002 100644 --- a/selenium-node-firefox-debug/Dockerfile +++ b/selenium-node-firefox-debug/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-firefox-debug:3.12.0-cobalt +FROM selenium/node-firefox-debug:3.141.59 ENV HOME=/home/seluser diff --git a/selenium-node-firefox/Dockerfile b/selenium-node-firefox/Dockerfile index 53f7f6e..3704c8c 100644 --- a/selenium-node-firefox/Dockerfile +++ b/selenium-node-firefox/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-firefox:3.6.0 +FROM selenium/node-firefox::3.141.59 ENV HOME=/home/seluser From a4e9c2e6118b7bc4ac46a6c63b5d04156856e53d Mon Sep 17 00:00:00 2001 From: Ollie Philpott Date: Mon, 22 Jun 2020 15:52:49 +0100 Subject: [PATCH 2/5] update to fork --- selenium-node-chrome-debug.yaml | 4 ++-- selenium-node-chrome.yaml | 4 ++-- selenium-node-firefox-debug.yaml | 4 ++-- selenium-node-firefox.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/selenium-node-chrome-debug.yaml b/selenium-node-chrome-debug.yaml index 49d0ae8..dea3cf3 100644 --- a/selenium-node-chrome-debug.yaml +++ b/selenium-node-chrome-debug.yaml @@ -19,8 +19,8 @@ objects: contextDir: selenium-node-chrome-debug type: Git git: - uri: https://github.com/ddavison/selenium-openshift-templates - ref: master + uri: https://github.com/genomicsengland/selenium-openshift-templates + ref: feature/update-images strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-chrome.yaml b/selenium-node-chrome.yaml index ac9de91..3dc1064 100644 --- a/selenium-node-chrome.yaml +++ b/selenium-node-chrome.yaml @@ -19,8 +19,8 @@ objects: contextDir: selenium-node-chrome type: Git git: - uri: https://github.com/ddavison/selenium-openshift-templates - ref: master + uri: https://github.com/genomicsengland/selenium-openshift-templates + ref: feature/update-images strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-firefox-debug.yaml b/selenium-node-firefox-debug.yaml index 8441d23..fafd676 100644 --- a/selenium-node-firefox-debug.yaml +++ b/selenium-node-firefox-debug.yaml @@ -19,8 +19,8 @@ objects: contextDir: selenium-node-firefox-debug type: Git git: - uri: https://github.com/ddavison/selenium-openshift-templates - ref: master + uri: https://github.com/genomicsengland/selenium-openshift-templates + ref: feature/update-images strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-firefox.yaml b/selenium-node-firefox.yaml index 65265b5..3c1ecda 100644 --- a/selenium-node-firefox.yaml +++ b/selenium-node-firefox.yaml @@ -19,8 +19,8 @@ objects: contextDir: selenium-node-firefox type: Git git: - uri: https://github.com/ddavison/selenium-openshift-templates - ref: master + uri: https://github.com/genomicsengland/selenium-openshift-templates + ref: feature/update-images strategy: type: Docker DockerStrategy: {} From 64e6b19beab6f33f2df60ab927bbc820844dc056 Mon Sep 17 00:00:00 2001 From: Ollie Philpott Date: Mon, 22 Jun 2020 16:34:21 +0100 Subject: [PATCH 3/5] fix firefox --- selenium-node-firefox.yaml | 2 +- selenium-node-firefox/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selenium-node-firefox.yaml b/selenium-node-firefox.yaml index 3c1ecda..578128a 100644 --- a/selenium-node-firefox.yaml +++ b/selenium-node-firefox.yaml @@ -3,7 +3,7 @@ kind: Template metadata: name: selenium-node-firefox annotations: - description: "Selenium Node with Google firefox browser" + description: "Selenium Node with Firefox browser" iconClass: "icon-selenium" tags: "selenium,node,firefox" objects: diff --git a/selenium-node-firefox/Dockerfile b/selenium-node-firefox/Dockerfile index 3704c8c..c80d1a9 100644 --- a/selenium-node-firefox/Dockerfile +++ b/selenium-node-firefox/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-firefox::3.141.59 +FROM selenium/node-firefox:3.141.59 ENV HOME=/home/seluser From 59cf857ffee98a68b9b8daa2f50a53d746aba0e8 Mon Sep 17 00:00:00 2001 From: Ollie Philpott Date: Mon, 22 Jun 2020 16:51:00 +0100 Subject: [PATCH 4/5] switch to master --- selenium-node-chrome-debug.yaml | 2 +- selenium-node-chrome.yaml | 2 +- selenium-node-firefox-debug.yaml | 2 +- selenium-node-firefox.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selenium-node-chrome-debug.yaml b/selenium-node-chrome-debug.yaml index dea3cf3..4de82ea 100644 --- a/selenium-node-chrome-debug.yaml +++ b/selenium-node-chrome-debug.yaml @@ -20,7 +20,7 @@ objects: type: Git git: uri: https://github.com/genomicsengland/selenium-openshift-templates - ref: feature/update-images + ref: master strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-chrome.yaml b/selenium-node-chrome.yaml index 3dc1064..38f3f88 100644 --- a/selenium-node-chrome.yaml +++ b/selenium-node-chrome.yaml @@ -20,7 +20,7 @@ objects: type: Git git: uri: https://github.com/genomicsengland/selenium-openshift-templates - ref: feature/update-images + ref: master strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-firefox-debug.yaml b/selenium-node-firefox-debug.yaml index fafd676..fedb6d6 100644 --- a/selenium-node-firefox-debug.yaml +++ b/selenium-node-firefox-debug.yaml @@ -20,7 +20,7 @@ objects: type: Git git: uri: https://github.com/genomicsengland/selenium-openshift-templates - ref: feature/update-images + ref: master strategy: type: Docker DockerStrategy: {} diff --git a/selenium-node-firefox.yaml b/selenium-node-firefox.yaml index 578128a..a8b6bfc 100644 --- a/selenium-node-firefox.yaml +++ b/selenium-node-firefox.yaml @@ -20,7 +20,7 @@ objects: type: Git git: uri: https://github.com/genomicsengland/selenium-openshift-templates - ref: feature/update-images + ref: master strategy: type: Docker DockerStrategy: {} From 471f8e9b5073b46fa115113392b9c6fb737eb8d9 Mon Sep 17 00:00:00 2001 From: Ollie Philpott Date: Mon, 22 Jun 2020 16:57:51 +0100 Subject: [PATCH 5/5] switch back to original repo --- selenium-node-chrome-debug.yaml | 2 +- selenium-node-chrome.yaml | 2 +- selenium-node-firefox-debug.yaml | 2 +- selenium-node-firefox.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selenium-node-chrome-debug.yaml b/selenium-node-chrome-debug.yaml index 4de82ea..49d0ae8 100644 --- a/selenium-node-chrome-debug.yaml +++ b/selenium-node-chrome-debug.yaml @@ -19,7 +19,7 @@ objects: contextDir: selenium-node-chrome-debug type: Git git: - uri: https://github.com/genomicsengland/selenium-openshift-templates + uri: https://github.com/ddavison/selenium-openshift-templates ref: master strategy: type: Docker diff --git a/selenium-node-chrome.yaml b/selenium-node-chrome.yaml index 38f3f88..ac9de91 100644 --- a/selenium-node-chrome.yaml +++ b/selenium-node-chrome.yaml @@ -19,7 +19,7 @@ objects: contextDir: selenium-node-chrome type: Git git: - uri: https://github.com/genomicsengland/selenium-openshift-templates + uri: https://github.com/ddavison/selenium-openshift-templates ref: master strategy: type: Docker diff --git a/selenium-node-firefox-debug.yaml b/selenium-node-firefox-debug.yaml index fedb6d6..8441d23 100644 --- a/selenium-node-firefox-debug.yaml +++ b/selenium-node-firefox-debug.yaml @@ -19,7 +19,7 @@ objects: contextDir: selenium-node-firefox-debug type: Git git: - uri: https://github.com/genomicsengland/selenium-openshift-templates + uri: https://github.com/ddavison/selenium-openshift-templates ref: master strategy: type: Docker diff --git a/selenium-node-firefox.yaml b/selenium-node-firefox.yaml index a8b6bfc..09a799f 100644 --- a/selenium-node-firefox.yaml +++ b/selenium-node-firefox.yaml @@ -19,7 +19,7 @@ objects: contextDir: selenium-node-firefox type: Git git: - uri: https://github.com/genomicsengland/selenium-openshift-templates + uri: https://github.com/ddavison/selenium-openshift-templates ref: master strategy: type: Docker