Skip to content

Commit

Permalink
Remove chromium installation as it is installed in opensearch-project…
Browse files Browse the repository at this point in the history
  • Loading branch information
peterzhuamazon authored Feb 27, 2024
1 parent 6cb96d5 commit 186e4fd
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 14 deletions.
10 changes: 0 additions & 10 deletions docker/ci/config/windows-servercore-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,6 @@ $userenv2 = [System.Environment]::GetEnvironmentVariable("Path", [System.Environ
$nodePathFixed = "C:\\Users\\ContainerAdministrator\\scoop\\persist\\volta\\appdata\\bin"
[System.Environment]::SetEnvironmentVariable("PATH", $userenv2 + ";$nodePathFixed", [System.EnvironmentVariableTarget]::User)

# Install chromium (internally it is chrome.exe in app directory)
# Lock chromium to v114.0.5735.134-r1135570 due to https://github.com/opensearch-project/opensearch-build/issues/4241
scoop install https://raw.githubusercontent.com/ScoopInstaller/Extras/6befedcb5296cacbb0428e76baab7368609b6006/bucket/chromium.json
$chromiumName = 'chrome.exe'
$chromiumDir = 'C:\\Users\\ContainerAdministrator\\scoop\\apps\\chromium'
$chromiumFound = (Get-ChildItem -Path $chromiumDir -Filter $chromiumName -Recurse | %{$_.FullName} | select -first 1)
$chromiumFound
# Add BROWSER_PATH path to User Env Var for cypress test to retrieve chromium.exe path
[System.Environment]::SetEnvironmentVariable("BROWSER_PATH", "$chromiumFound", [System.EnvironmentVariableTarget]::User)

# Install fonts for the chromium-based browsers: https://github.com/opensearch-project/opensearch-build/issues/4416
# Based on this repo: https://github.com/gantrior/docker-chrome-windows
# From this issue: https://github.com/docker/for-win/issues/3438
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ RUN pip3 install cmake==3.23.3
# The setup part is partially based on Austin Dewey's article:
# https://austindewey.com/2019/03/26/enabling-software-collections-binaries-on-a-docker-image/
RUN yum install -y centos-release-scl && yum install -y devtoolset-7 && yum clean all && \
echo "source scl_source enable devtoolset-7" > /etc/profile.d/scl_devtoolset8.sh
echo "source scl_source enable devtoolset-7" > /etc/profile.d/scl_devtoolset7.sh
COPY --chown=0:0 config/scl_setup_devtoolset7 /usr/local/bin/scl_setup
ENV BASH_ENV="/usr/local/bin/scl_setup"
ENV ENV="/usr/local/bin/scl_setup"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \
pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17

# Add other dependencies
RUN yum install -y epel-release && yum clean all && yum install -y chromium jq && yum clean all && rm -rf /var/cache/yum/* && \
RUN yum install -y epel-release && yum clean all && yum install -y jq && yum clean all && rm -rf /var/cache/yum/* && \
pip3 install cmake==3.23.3

# Change User
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \
pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17

# Add other dependencies
RUN dnf install -y epel-release && dnf clean all && dnf install -y chromium jq && dnf clean all && \
RUN dnf install -y epel-release && dnf clean all && dnf install -y jq && dnf clean all && \
pip3 install cmake==3.23.3

# We use the version test to check if packages installed correctly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ RUN apt-get update -y && apt-get install python3 && \
# Install necessary packages
RUN apt-get update -y && apt-get upgrade -y && apt-get install -y curl git gnupg2 tar procps build-essential cmake zip unzip jq && \
apt-get install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb && \
apt-get install -y chromium-browser && \
apt-get install -y pigz && \
apt-get clean -y

Expand Down

0 comments on commit 186e4fd

Please sign in to comment.