diff --git a/Dockerfile b/Dockerfile index 48b139b..17d6ae0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,22 @@ -FROM python:3.9-slim-bullseye +FROM python:3.11-slim-bullseye ARG TARGETOS ARG TARGETARCH ARG GECKODRIVER_VERSION=0.32.0 -RUN apt-get update && \ - apt-get -y install jq firefox-esr curl git && \ - rm -r /var/lib/apt/lists/* +RUN install -d -m 0755 /etc/apt/keyrings && \ + apt-get update && \ + apt-get -y install wget gnupg2 jq curl git fonts-liberation libdrm2 libgbm1 libnspr4 libnss3 libu2f-udev libvulkan1 xdg-utils && \ + wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null && \ + gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print "\n"$0"\n"}' && \ + echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null && \ + printf 'Package: *\nPin: origin packages.mozilla.org\nPin-Priority: 1000' >/etc/apt/preferences.d/mozilla && \ + apt-get update && \ + apt-get -y install firefox && \ + wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \ + dpkg -i google-chrome-stable_current_amd64.deb && \ + rm -r /var/lib/apt/lists/* google-chrome-stable_current_amd64.deb COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt && \ rm requirements.txt - -COPY geckodriver.sh . -RUN ./geckodriver.sh $GECKODRIVER_VERSION $TARGETOS $TARGETARCH && \ - rm geckodriver.sh - -# echo "192.168.65.2 app-acctest auth0 api-acctest" >> /etc/hosts diff --git a/geckodriver.sh b/geckodriver.sh deleted file mode 100755 index ffc02ff..0000000 --- a/geckodriver.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -o errexit -o pipefail -o noclobber -o nounset - -VERSION=${1:-"0.32.0"} -OS=${2:-linux} -ARCH=${3:-} -OS_ARCH="" - -if [ "${ARCH}" == "amd64" ]; then - OS_ARCH="${OS}64" -elif [ "${ARCH}" == "arm64" ]; then - OS_ARCH="${OS}-aarch64" -fi - -GH_URL="https://github.com/mozilla/geckodriver/releases/download/" -TMP_FILE="geckodriver.tar.gz" -curl -L -s \ - -o ${TMP_FILE} \ - "${GH_URL}v${VERSION}/geckodriver-v${VERSION}-${OS_ARCH}.tar.gz" - -tar -xzf ${TMP_FILE} -mv geckodriver /usr/bin -rm ${TMP_FILE} diff --git a/requirements.txt b/requirements.txt index 8c8c208..1cfb468 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,10 @@ -robotframework==6.0.1 -robotframework-seleniumlibrary==6.0.0 -urllib3==1.26.13 -psycopg2-binary==2.9.5 -PyMySQL==1.0.2 +robotframework==7.0 +robotframework-seleniumlibrary==6.2.0 +urllib3==2.1.0 +psycopg2-binary==2.9.9 +PyMySQL==1.1.0 robotframework-appiumlibrary==2.0.0 -robotframework-databaselibrary==1.2.4 +robotframework-databaselibrary==1.4.3 robotframework-httplibrary==0.4.2 -git+https://github.com/JakUi/robotframework-rabbitmq-fork#egg=robotframework-rabbitmq-ao +webdrivermanager==0.10.0 +robotframework-http-rabbitmq==1.0.3