Skip to content

Commit

Permalink
Merge pull request #657 from opendevstack/bugfix/GH-656-jenkins-nodej…
Browse files Browse the repository at this point in the history
…s12-agent-build-failing-due-to-incompatible-chrome-package-with-centos7

install specific chrome package version in jenkins nodejs12 agent
  • Loading branch information
stitakis authored Oct 25, 2021
2 parents 39acc7a + a226ceb commit 35ca70f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

### Fixed

- jenkins nodejs12 agent build failing due to incompatible chrome package with centos 7 ([#656](https://github.com/opendevstack/ods-quickstarters/pull/656))
- ds-rshiny cleanup cloudera dependency ([#540](https://github.com/opendevstack/ods-quickstarters/pull/540))
- Removed forcing eslint configuration as it is default ([#573](https://github.com/opendevstack/ods-quickstarters/pull/578))
- Recover be-python-flask ([#583](https://github.com/opendevstack/ods-quickstarters/issues/583))
Expand Down
11 changes: 6 additions & 5 deletions common/jenkins-agents/nodejs12/docker/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ ENV NODEJS_VERSION=12 \
ENV=/usr/local/bin/scl_enable \
PROMPT_COMMAND=". /usr/local/bin/scl_enable" \
LANG=en_US.UTF-8 \
LC_ALL=en_US.UTF-8
LC_ALL=en_US.UTF-8 \
CHROME_VERSION=94.0.4606.81

# install google-chrome (for angular)
RUN yum-config-manager --enable rhel-7-server-extras-rpms && \
yum-config-manager --enable rhel-7-server-optional-rpms

ADD https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm /root/google-chrome-stable_current_x86_64.rpm
ADD https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-${CHROME_VERSION}-1.x86_64.rpm /root/google-chrome.rpm
RUN yum -y install redhat-lsb libXScrnSaver
RUN yum -y install /root/google-chrome-stable_current_x86_64.rpm && \
RUN yum -y install /root/google-chrome.rpm && \
ln -s /usr/lib64/libOSMesa.so.8 /opt/google/chrome/libosmesa.so && \
yum clean all && \
dbus-uuidgen > /etc/machine-id

dbus-uuidgen > /etc/machine-id && \
rm /root/google-chrome.rpm

# Install cypress dependencies
# Please note: xorg-x11-server-Xvfb is not available on RHEL via yum anymore, so "RUN yum install -y xorg-x11-server-Xvfb" won't work.
Expand Down

0 comments on commit 35ca70f

Please sign in to comment.