Merge branch 'trunk' of github.com:SeleniumHQ/docker-selenium into trunk

# Conflicts:
#	.github/workflows/build-test.yml

Author: diemol

.github/workflows/build-test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - trunk
-      - upgrade-ubuntu-bionic-20200639
   pull_request:
     branches:
       - trunk
@@ -26,16 +25,18 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - name: Extract branch Name
-        run: echo "::set-env name=BRANCH::$(echo ${GITHUB_REF##*/})"
+      - name: Get branch name (only for push to branch)
+        if: github.event_name == 'push'
+        run: echo "::set-env name=BRANCH::$(echo ${PUSH_BRANCH##*/})"
+        env:
+          PUSH_BRANCH: ${{ github.ref }}
+      - name: Get target branch name (only for PRs)
+        if: github.event_name == 'pull_request'
+        run: echo "::set-env name=BRANCH::$(echo ${TARGET_BRANCH##*/})"
+        env:
+          TARGET_BRANCH: ${{ github.head_ref }}
       - name: Output branch name
         run: echo ${BRANCH}
-      - name: Output GitHub Head ref
-        if: github.event_name == 'pull_request'
-        run: echo ${{ github.head_ref }}
-      - name: Output GitHub ref
-        if: github.event_name == 'push'
-        run: echo ${{ github.ref }}
       - name: Build Docker images
         run: VERSION=${BRANCH} make build
       - name: Test Docker images

Base/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20191029
+FROM ubuntu:bionic-20200630
 LABEL authors="Selenium <[email protected]>"
 
 #================================================