Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NodeJS Upgrade] Update devtoolset to v8 for CentOS7/Node16 upgrade #3585

Merged
merged 2 commits into from
May 31, 2023
Merged

[NodeJS Upgrade] Update devtoolset to v8 for CentOS7/Node16 upgrade #3585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1924ee
Update devtoolset to v8 for CentOS7/Node16 upgrade
peterzhuamazon May 31, 2023
a3c21eb
Remove entrypoint that is not used anymore
peterzhuamazon May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions docker/ci/config/build-opensearch-dashboards-entrypoint.sh
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions docker/ci/config/scl_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
. scl_source enable devtoolset-8
16 changes: 11 additions & 5 deletions docker/ci/dockerfiles/current/build.centos7.opensearch-dashboards.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg2 --import - && \

# Switch shell for rvm related commands
SHELL ["/bin/bash", "-lc"]
CMD ["/bin/bash", "-l"]

# Install ruby / rpm / fpm related dependencies
RUN . /etc/profile.d/rvm.sh && rvm install 2.6.0 && rvm --default use 2.6.0 && yum install -y rpm-build createrepo && yum clean all
Expand All @@ -74,7 +73,7 @@ ENV PATH=$RUBY_HOME:$RVM_HOME:$PATH
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand All @@ -83,6 +82,16 @@ RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
ln -sfn /usr/local/bin/pip3.7 /usr/bin/pip3 && \
pip3 install pipenv && pipenv --version

# Upgrade gcc8
# 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-8 && yum clean all && \
echo "source scl_source enable devtoolset-8" > /etc/profile.d/scl_devtoolset8.sh
COPY --chown=0:0 config/scl_setup /usr/local/bin/scl_setup
ENV BASH_ENV="/usr/local/bin/scl_setup"
ENV ENV="/usr/local/bin/scl_setup"
ENV PROMPT_COMMAND=". /usr/local/bin/scl_setup"

# Change User
USER 1000
WORKDIR /usr/share/opensearch
Expand All @@ -96,7 +105,6 @@ ENV PATH=/usr/share/opensearch/.gem/gems/fpm-1.14.2/bin:$PATH
ENV NVM_DIR /usr/share/opensearch/.nvm
ENV NODE_VERSION 10.24.1
ARG NODE_VERSION_LIST="10.24.1 14.19.1 14.20.0 14.20.1 14.21.3 16.20.0"
COPY --chown=1000:1000 config/build-opensearch-dashboards-entrypoint.sh /usr/share/opensearch
# install nvm
# /~https://github.com/creationix/nvm#install-script
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
Expand All @@ -114,5 +122,3 @@ RUN node -v
RUN npm -v
RUN yarn -v
RUN fpm -v
ENTRYPOINT ["bash", "/usr/share/opensearch/build-opensearch-dashboards-entrypoint.sh"]
CMD ["$NODE_VERSION"]
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ ENV PATH=$RUBY_HOME:$RVM_HOME:$PATH
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ENV PATH=$RUBY_HOME:$RVM_HOME:$PATH
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down
2 changes: 1 addition & 1 deletion ...lease.centos.clients.x64.arm64.dockerfile → ...ease.centos7.clients.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN chmod -R 777 /dev/shm
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/test.centos7.performance-test.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN yum install -y @development zlib-devel bzip2 bzip2-devel readline-devel sqli
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ RUN chmod -R 777 /dev/shm
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ RUN chmod -R 777 /dev/shm
RUN curl https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz | tar xzvf - && \
cd Python-3.7.7 && \
./configure --enable-optimizations && \
make altinstall
make altinstall -j $(( `nproc` / 2 ))

# Setup Python37 links
RUN ln -sfn /usr/local/bin/python3.7 /usr/bin/python3 && \
Expand Down