[osh-selenium] Add focal-based image for selenium

Change-Id: If085ceaba88d098c397f018df144fdadd81994f8
This commit is contained in:
astebenkova 2023-01-16 17:19:13 +02:00
parent dff69d52d9
commit 43fbf7f025
3 changed files with 28 additions and 4 deletions

View File

@ -0,0 +1,18 @@
ARG FROM=docker.io/ubuntu:focal
FROM ${FROM}
ENV DEBIAN_FRONTEND=noninteractive
RUN set -xe && \
apt-get update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y python3 python3-pip unzip wget gnupg && \
python3 -m pip install --upgrade --no-cache-dir pip && \
python3 -m pip install --no-cache-dir selenium && \
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/chrome.list && \
apt update && apt install --no-install-recommends -y google-chrome-stable && \
CHROME_VERSION=$(dpkg -s google-chrome-stable | grep -Po '(?<=^Version: ).*' | awk -F'.' '{print $1"."$2"."}') && \
DRIVER_PATH=$(wget -qO- https://chromedriver.storage.googleapis.com | grep -Po "(?<=<Key>)${CHROME_VERSION}[^<]*?chromedriver_linux64\.zip(?=</Key>)" | tail -1) && \
wget --directory-prefix=/tmp/ "https://chromedriver.storage.googleapis.com/${DRIVER_PATH}" && \
unzip /tmp/chromedriver_linux64.zip -d /etc/selenium && \
rm -rf /var/lib/apt/lists/* /tmp/*

View File

@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
IMAGE="osh-selenium"
VERSION=${VERSION:-latest}
DISTRO=${DISTRO:-ubuntu_bionic}
DISTRO=${DISTRO:-ubuntu_focal}
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}

View File

@ -38,12 +38,18 @@
vars: &osh-selenium_vars
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
docker_images:
#- context: osh-selenium
# repository: openstackhelm/osh-selenium
# dockerfile: Dockerfile.ubuntu_bionic
# tags:
# - latest-ubuntu_bionic
# - "ubuntu_bionic-{{ currentdate }}"
- context: osh-selenium
repository: openstackhelm/osh-selenium
dockerfile: Dockerfile.ubuntu_bionic
dockerfile: Dockerfile.ubuntu_focal
tags:
- latest-ubuntu_bionic
- "ubuntu_bionic-{{ currentdate }}"
- latest-ubuntu_focal
- "ubuntu_focal-{{ currentdate }}"
#- context: osh-selenium
# repository: openstackhelm/osh-selenium
# dockerfile: Dockerfile.opensuse_15