Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into gh-15972
Browse files Browse the repository at this point in the history
  • Loading branch information
krasinski committed Feb 23, 2024
2 parents f21f34b + 2bf3f5b commit 0705563
Show file tree
Hide file tree
Showing 73 changed files with 680 additions and 311 deletions.
26 changes: 15 additions & 11 deletions docker/jenkins-images/Dockerfile-build-base
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
ARG FROM_VERSION
FROM harbor.h2o.ai/opsh2oai/h2o-3/dev-r-3.4.1:${FROM_VERSION}

RUN \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
texlive \
texlive-fonts-extra \
texlive-htmlxml \
texinfo \
texlive-bibtex-extra \
texlive-formats-extra \
texlive-generic-extra && \
ENV NODE_MAJOR '16'

RUN apt-get update && apt-get install -y ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --no-tty --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
nodejs \
texlive \
texlive-fonts-extra \
texlive-latex-extra \
texlive-latex-recommended \
texlive-plain-generic \
texinfo \
texlive-bibtex-extra \
texlive-formats-extra && \
apt-get clean && \
apt-get autoremove -y && \
rm -rf /var/cache/apt/*
Expand Down
6 changes: 5 additions & 1 deletion docker/jenkins-images/Dockerfile-jdk-others-base
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
ARG FROM_VERSION
FROM harbor.h2o.ai/opsh2oai/h2o-3/dev-base:${FROM_VERSION}

ENV NODE_MAJOR '16'

RUN \
add-apt-repository -y ppa:deadsnakes && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get update && apt-get install -y ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --no-tty --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
python3-virtualenv libkrb5-dev nodejs && \
Expand Down
16 changes: 11 additions & 5 deletions docker/jenkins-images/Dockerfile-python-base
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
ARG FROM_VERSION
FROM harbor.h2o.ai/opsh2oai/h2o-3/dev-jdk-8-base:${FROM_VERSION}

ENV NODE_MAJOR '16'

RUN \
add-apt-repository -y ppa:deadsnakes && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get update && apt-get install -y ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --no-tty --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update -q -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 \
libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 \
libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libx11-xcb-dev libxcb1 libxcomposite1 libxcomposite-dev \
libxcursor1 libxcursor-dev libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils libblas-dev liblapack-dev \
chromium-browser \
libkrb5-dev \
nodejs && \
libgbm1 libkrb5-dev nodejs && \
apt-get clean && \
rm -rf /var/cache/apt/*
rm -rf /var/cache/apt/* && \
wget "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F1244635%2Fchrome-linux.zip?alt=media" -O chrome-linux.zip && \
unzip chrome-linux.zip -d /opt/ && \
rm chrome-linux.zip && \
ln -s /opt/chrome-linux/chrome /usr/bin/chromium-browser

ENV CHROME_BIN=/usr/bin/chromium-browser

Expand Down
10 changes: 10 additions & 0 deletions docker/jenkins-images/Dockerfile-r
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ FROM harbor.h2o.ai/opsh2oai/h2o-3/dev-r-base:${FROM_VERSION}
ARG R_VERSION
ENV R_VERSION=${R_VERSION}

# Old R versions (at least 3.3 and 3.4) are written in a way that is not compilable. This is likely due to the change in
# gcc-10 (GCC now defaults to -fno-common. As a result, global variable accesses are more efficient on various targets.
# In C, global variables with multiple tentative definitions now result in linker errors. With -fcommon such definitions
# are silently merged during linking.). I tried using -fcommon but without much luck so due to the time constrain I
# decided to use gcc-9 instead.
RUN apt-get update && apt-get install -y gcc-9 gfortran-9 g++-9 tcl-dev tk-dev && apt-get clean && apt-get autoremove -y && \
rm -rf /var/cache/apt/* &&\
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 99 --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
--slave /usr/bin/gcov gcov /usr/bin/gcov-9 && update-alternatives --install /usr/bin/gfortran f95 /usr/bin/gfortran-9 99

COPY scripts/install_R_version /tmp/
RUN \
chmod +x /tmp/install_R_version && \
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/build-h2o-3
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ ! ${H2O_BRANCH} ]]; then
fi
if [[ ! -n ${PYTHON_VERSION} ]]; then
echo "Using default Python version"
PYTHON_VERSION='3.6'
PYTHON_VERSION='3.7'
fi

# cd home
Expand Down

0 comments on commit 0705563

Please sign in to comment.