Update osh-selenium for python3
This change updates the osh-selenium image to be built on ubuntu:bionic and to use python3 instead of python2 Change-Id: Id47448a55866dcf582b9e3801ea5f57f11068242
This commit is contained in:
parent
3ae2b8b445
commit
8c633a76c1
|
@ -1,9 +1,9 @@
|
|||
FROM docker.io/ubuntu:xenial
|
||||
FROM docker.io/ubuntu:bionic
|
||||
|
||||
RUN apt-get -y update \
|
||||
&& apt-get install -y python-pip unzip wget
|
||||
|
||||
RUN /usr/bin/pip install selenium
|
||||
&& apt-get install --no-install-recommends -y python3 python3-pip unzip wget gnupg \
|
||||
&& python3 -m pip install --upgrade pip \
|
||||
&& python3 -m pip install selenium
|
||||
|
||||
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
|
||||
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
|
||||
|
@ -11,6 +11,6 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
|
|||
&& unzip /tmp/chromedriver_linux64.zip -d /etc/selenium
|
||||
|
||||
RUN apt-get -y update \
|
||||
&& apt-get install -y google-chrome-stable \
|
||||
&& apt-get install --no-install-recommends -y google-chrome-stable \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
|
@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
|
|||
|
||||
IMAGE="osh-selenium"
|
||||
VERSION=${VERSION:-latest}
|
||||
DISTRO=${DISTRO:-ubuntu_xenial}
|
||||
DISTRO=${DISTRO:-ubuntu_bionic}
|
||||
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}
|
||||
|
|
|
@ -36,10 +36,10 @@
|
|||
docker_images:
|
||||
- context: osh-selenium
|
||||
repository: openstackhelm/osh-selenium
|
||||
dockerfile: Dockerfile.ubuntu_xenial
|
||||
dockerfile: Dockerfile.ubuntu_bionic
|
||||
tags:
|
||||
- latest-ubuntu_xenial
|
||||
- "ubuntu_xenial-{{ currentdate }}"
|
||||
- latest-ubuntu_bionic
|
||||
- "ubuntu_bionic-{{ currentdate }}"
|
||||
- context: osh-selenium
|
||||
repository: openstackhelm/osh-selenium
|
||||
dockerfile: Dockerfile.opensuse_15
|
||||
|
|
Loading…
Reference in New Issue