Skip to content

Migrate system-builder to Ruby 2.5 #15

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

Merged
merged 3 commits into from
Jan 22, 2020
Merged

Migrate system-builder to Ruby 2.5 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08301e8
Ruby 2.5 Software Collections base image
gsaslis Oct 10, 2018
bc66d97
Install file command from yum
duduribeiro Jan 9, 2020
2dfe219
[Dockerfile] Do not set RAILS_ENV and remove CMD
hallelujah Jan 16, 2020
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
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos/ruby-24-centos7
FROM centos/ruby-25-centos7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would use UBI instead of RHSCL CentOS

Copy link
Contributor

@gsaslis gsaslis Jan 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. 👍

registry.access.redhat.com/rhscl/ruby-25-rhel7:2.5 is UBI-based. let's go for that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsaslis we tried but without success 😞

Our system-builder needs a lot of xdg- packages to have chrome installed on it to be used on CI stuffs. UBI images don't have it and neither the package available to install. We can install it using centos packages but we can't guarantee to not make a mess in the packaging stuff of RHEL.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@duduribeiro do you have that list of packages missing from UBI images handy anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsaslis AFAIK, these:

	libXss.so.1()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	libatk-1.0.so.0()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	libgconf-2.so.4()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	libgdk-3.so.0()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	libgdk_pixbuf-2.0.so.0()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	libgtk-3.so.0()(64bit) is needed by google-chrome-stable-63.0.3239.108-1.x86_64
	xdg-utils is needed by google-chrome-stable-63.0.3239.108-1.x86_64


ENV BUNDLER_VERSION="1.17.3" \
OPENRESTY_VERSION=1.11.2.1 \
Expand All @@ -10,7 +10,6 @@ ARG DB=mysql
ENV PATH="./node_modules/.bin:$PATH:/usr/local/nginx/sbin/:/usr/local/luajit/bin/" \
DISPLAY=:99.0 \
SKIP_ASSETS="1" \
RAILS_ENV=test \
TZ=:/etc/localtime \
LD_LIBRARY_PATH=/opt/oracle/instantclient_12_2/ \
ORACLE_HOME=/opt/oracle/instantclient_12_2/ \
Expand All @@ -30,6 +29,7 @@ RUN yum install -y git \
make \
sudo \
rh-nodejs8 \
file \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@duduribeiro not that it's a problem or anything, just wondering why this is needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsaslis we need it since ImageMagick uses it to verify if a file is an image or not.

our ruby-24-centos image had it, but it was removed from ruby-25-centos.

&& echo 'default ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers

RUN echo --color > ~/.rspec \
Expand Down Expand Up @@ -109,5 +109,3 @@ VOLUME [ "/opt/system/tmp/cache/", \
USER default

ENTRYPOINT ["container-entrypoint"]

CMD ["script/jenkins.sh"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build: Dockerfile
test:
# docker run --user root --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep '
# docker run --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep /ruby'
docker run --rm $(IMAGE_NAME) ruby -v | grep 2.4
docker run --rm $(IMAGE_NAME) ruby -v | grep 2.5
docker run --rm $(IMAGE_NAME) node -v
docker run --rm $(IMAGE_NAME) bundle -v
docker run --rm $(IMAGE_NAME) sh -c 'sudo ls -al /root'