diff --git a/graphite/README.md b/graphite/README.md index d48ff4b..5bac664 100644 --- a/graphite/README.md +++ b/graphite/README.md @@ -58,6 +58,7 @@ $ tree -F -L 4 │   │   ├── rewrite-rules.conf │   │   └── storage-schemas.conf │   └── storage/ +│   ├── carbon-aggregator-a.pid │   ├── carbon-cache-a.pid │   ├── graphite.db │   ├── log/ @@ -69,6 +70,9 @@ $ tree -F -L 4 $ curl http://localhost:8080 ``` +> :warning: Stale pid files may prevent services from starting. +> Please delete these pid files manually before restarting or upgrading container. + ## storage-schemas.conf ```ini diff --git a/hubot/Dockerfile b/hubot/Dockerfile index e422119..a0cef17 100644 --- a/hubot/Dockerfile +++ b/hubot/Dockerfile @@ -2,8 +2,8 @@ # Dockerfile for hubot # -FROM alpine -MAINTAINER kev +FROM alpine:3 +MAINTAINER EasyPi Software Foundation ENV HUBOT_NAME=Hubot ENV HUBOT_ADAPTER=slack @@ -35,7 +35,7 @@ RUN set -xe \ VOLUME /home/hobot \ /usr/local/bin \ - /usr/lib/python3.7/site-packages + /usr/lib/python3.8/site-packages EXPOSE 8080 diff --git a/hubot/arm/Dockerfile b/hubot/arm/Dockerfile index 4464d68..8101981 100644 --- a/hubot/arm/Dockerfile +++ b/hubot/arm/Dockerfile @@ -11,7 +11,7 @@ ENV HUBOT_DESCRIPTION=$HUBOT_NAME-$HUBOT_ADAPTER ENV HUBOT_SLACK_TOKEN= RUN set -xe \ - && apk add --update ca-certificates nodejs nodejs-npm \ + && apk add --update ca-certificates nodejs nodejs-npm python3 \ && npm install -g yo generator-hubot \ && adduser -s /bin/sh -D hubot @@ -33,7 +33,10 @@ RUN set -xe \ url \ && sed -i -r 's/^\s+#//' scripts/example.coffee -VOLUME /home/hobot +VOLUME /home/hobot \ + /usr/local/bin \ + /usr/lib/python3.8/site-packages + EXPOSE 8080 CMD ["./bin/hubot", "--adapter", "slack"] diff --git a/hubot/docker-compose.yml b/hubot/docker-compose.yml index 22ea520..bdd92c2 100644 --- a/hubot/docker-compose.yml +++ b/hubot/docker-compose.yml @@ -6,4 +6,4 @@ hubot: - ./data:/home/hubot/scripts environment: - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx - restart: always + restart: unless-stopped diff --git a/selenoid/README.md b/selenoid/README.md index a6a322c..bf00c40 100644 --- a/selenoid/README.md +++ b/selenoid/README.md @@ -27,27 +27,27 @@ Required Images - aerokube/selenoid:latest-release - aerokube/selenoid-ui:latest-release - selenoid/video-recorder:latest-release -- selenoid/chrome:79.0 -- selenoid/firefox:72.0 -- selenoid/vnc:chrome_79.0 -- selenoid/vnc:firefox_72.0 +- selenoid/chrome:80.0 +- selenoid/firefox:74.0 +- selenoid/vnc:chrome_80.0 +- selenoid/vnc:firefox_74.0 ```json { "chrome": { - "default": "79.0", + "default": "80.0", "versions": { - "79.0": { - "image": "selenoid/vnc:chrome_79.0", + "80.0": { + "image": "selenoid/vnc:chrome_80.0", "port": "4444" } } }, "firefox": { - "default": "72.0", + "default": "74.0", "versions": { - "72.0": { - "image": "selenoid/vnc:firefox_72.0", + "74.0": { + "image": "selenoid/vnc:firefox_74.0", "port": "4444" } } @@ -62,7 +62,7 @@ from selenium import webdriver capabilities = { "browserName": "chrome", - "version": "79.0", + "version": "80.0", "enableVNC": True, "enableVideo": False } diff --git a/selenoid/data/config/browsers.json b/selenoid/data/config/browsers.json index 69a467b..852ce1b 100644 --- a/selenoid/data/config/browsers.json +++ b/selenoid/data/config/browsers.json @@ -1,18 +1,18 @@ { "chrome": { - "default": "79.0", + "default": "80.0", "versions": { - "79.0": { - "image": "selenoid/vnc:chrome_79.0", + "80.0": { + "image": "selenoid/vnc:chrome_80.0", "port": "4444" } } }, "firefox": { - "default": "72.0", + "default": "74.0", "versions": { - "72.0": { - "image": "selenoid/vnc:firefox_72.0", + "74.0": { + "image": "selenoid/vnc:firefox_74.0", "port": "4444" } }