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

Fix Dockerfile. Add vim and ps to UBI images #1441

Merged
merged 1 commit into from
Jul 27, 2024
Merged

Fix Dockerfile. Add vim and ps to UBI images #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion openc3-ruby/Dockerfile-ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COPY *.tar.gz /tmp/
ARG PACKAGES="gcc-c++ patch readline zlib zlib-devel libffi-devel libedit \
openssl-devel make nc bzip2 autoconf automake libtool sqlite-devel libpq-devel \
python3.11 python3.11-devel python3.11-pip python3.11-numpy ca-certificates curl less git \
libxml2-devel libxslt-devel libyaml-devel cmake glibc-static"
libxml2-devel libxslt-devel libyaml-devel cmake glibc-static vim procps"

RUN rm /etc/yum.repos.d/*
COPY ./ubi.repo /etc/yum.repos.d/ubi.repo
Expand Down
2 changes: 2 additions & 0 deletions openc3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ RUN mkdir -p lib/openc3/ext \
&& mkdir -p gems \
&& mv *.gem gems/. \
# TODO: Remove google-protobuf / grpc manually install once grpc fixed
# Uninstall twice is intentional because --all doesn't work
Copy link
Member

Choose a reason for hiding this comment

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

I removed the previous double install because I thought it was a typo. Thanks for the comment! Hopefully this all goes away soon.

&& gem install google-protobuf -v 3.24.0 --platform ruby \
&& gem install grpc -v 1.59.2 \
&& gem uninstall google-protobuf -v "!= 3.24.0" --all \
&& gem uninstall google-protobuf -v "!= 3.24.0" --all \
&& gem cleanup \
&& rm -rf /usr/lib/ruby/gems/*/cache/* /var/cache/apk/* /tmp/* /var/tmp/*

Expand Down
Loading