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.

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 Conjur build #2084

Merged
merged 1 commit into from Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
Expand Up @@ -17,6 +17,7 @@ RUN apt-get install -y build-essential \
git \
ldap-utils \
tzdata \
shared-mime-info \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /opt/conjur-server
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.fpm
Expand Up @@ -3,7 +3,8 @@ FROM @@image@@

RUN apt-get update -y && \
apt-get install -y zlib1g-dev \
liblzma-dev
liblzma-dev \
shared-mime-info

ENV BUNDLER_VERSION 2.1.4
RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.ubi
Expand Up @@ -23,6 +23,7 @@ RUN INSTALL_PKGS="gcc \
glibc-devel \
libxml2-devel \
libxslt-devel \
shared-mime-info \
make \
openldap-clients \
redhat-rpm-config \
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Expand Up @@ -240,7 +240,8 @@ GEM
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mimemagic (0.3.6)
mimemagic (0.3.8)
nokogiri (~> 1)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.14.4)
Expand All @@ -250,10 +251,10 @@ GEM
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.5.5)
nokogiri (1.11.1)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.1-x86_64-darwin)
nokogiri (1.11.2-x86_64-darwin)
racc (~> 1.4)
openid_connect (1.2.0)
activemodel
Expand Down
2 changes: 2 additions & 0 deletions package.sh
Expand Up @@ -11,6 +11,7 @@ chmod +x docker-debify
possum \
-- \
--depends tzdata \
--depends shared-mime-info

# Create possum rpm
# The '--rpm-rpmbuild-define' flag is added to avoid packaging build
Expand All @@ -21,4 +22,5 @@ chmod +x docker-debify
possum \
-- \
--depends tzdata \
--depends shared-mime-info \
--rpm-rpmbuild-define '_build_id_links none'