diff --git a/.dockerignore b/.dockerignore index 0ece2222fb..c872e2e2ea 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,6 +12,7 @@ cucumber *.deb .git +.idea engines/conjur_audit/spec/dummy/log coverage demo diff --git a/CHANGELOG.md b/CHANGELOG.md index 08c7c4b3d7..9e812febae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Introduces support for Policy Factory, which enables resource creation through a new `factories` API. [cyberark/conjur#2855](https://github.com/cyberark/conjur/pull/2855/files) +- Use base images with newer Ubuntu and UBI. + Display FIPS Mode status in the UI (requires temporary fix for OpenSSL gem). + [cyberark/conjur#2874](https://github.com/cyberark/conjur/pull/2874) ### Changed - The database thread pool max connection size is now based on the number of diff --git a/Dockerfile b/Dockerfile index 14943c8e82..2fe6080e40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,17 +30,6 @@ ENV PATH="${PATH}:${CONJUR_HOME}/bin" WORKDIR ${CONJUR_HOME} -RUN apt-get update -y && \ - apt-get -y dist-upgrade && \ - apt-get install -y libz-dev - -RUN apt-get install -y build-essential \ - curl \ - git \ - ldap-utils \ - tzdata \ - && rm -rf /var/lib/apt/lists/* - # Ensure few required GID0-owned folders to run as a random UID (OpenShift requirement) RUN mkdir -p $TMP_DIR \ $LOG_DIR \ diff --git a/Dockerfile.fpm b/Dockerfile.fpm index ca25aa6995..345c840137 100644 --- a/Dockerfile.fpm +++ b/Dockerfile.fpm @@ -5,8 +5,7 @@ RUN apt-get update -y && \ apt-get install -y zlib1g-dev \ liblzma-dev -ENV BUNDLER_VERSION 2.2.33 -RUN gem install --no-document bundler:$BUNDLER_VERSION fpm +RUN gem install --no-document fpm RUN mkdir -p /src/opt/conjur/project @@ -19,7 +18,7 @@ COPY gems/ gems/ COPY . . # removing CA bundle of httpclient gem -RUN find / -name httpclient -type d -exec find {} -name *.pem -type f -delete \; +RUN find / -name httpclient -type d -exec find {} -name "*.pem" -type f -delete \; ADD debify.sh / diff --git a/Dockerfile.test b/Dockerfile.test index 4a0c644efd..e7e11b5bd3 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -14,10 +14,12 @@ RUN bundle config unset --local without && \ bundle config unset --local path && \ bundle config set --local deployment false && \ bundle config --local jobs "$(nproc --all)" && \ - bundle install - -# removing CA bundle of httpclient gem -RUN find / -name httpclient -type d -exec find {} -name "*.pem" -type f -delete \; + bundle install && \ + # removing CA bundle of httpclient gem + find / -name 'httpclient-*' -type d -exec find {} -name '*.pem' -type f -delete \; && \ + find / -name 'httpclient-*' -type d -exec find {} -name '*.key' -type f -delete \; && \ + # remove the private key in the oidc_connect gem spec directory + find / -name openid_connect -type d -exec find {} -name '*.pem' -type f -delete \; FROM conjur:${VERSION} diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 7e550e810d..c2f9924ede 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -8,13 +8,6 @@ WORKDIR ${CONJUR_HOME} COPY Gemfile Gemfile.lock ./ COPY ./gems/ ./gems/ -# Install package dependencies for Conjur -RUN INSTALL_PKGS="openldap-clients \ - tzdata" && \ - yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - yum -y clean all --enablerepo='*' - RUN bundle config set --local without 'test development' && \ bundle config set --local deployment true && \ bundle config set --local path vendor/bundle && \ diff --git a/Gemfile.lock b/Gemfile.lock index 13f53de845..be6c74648c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -283,7 +283,7 @@ GEM net-smtp marcel (1.0.2) method_source (1.0.0) - mime-types (3.5.0) + mime-types (3.5.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) mini_mime (1.1.2) @@ -293,14 +293,14 @@ GEM net-imap (0.3.7) date net-protocol - net-ldap (0.17.0) + net-ldap (0.18.0) net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout net-smtp (0.3.3) net-protocol - net-ssh (6.1.0) + net-ssh (7.1.0) netrc (0.11.0) nio4r (2.5.9) nokogiri (1.15.3-x86_64-darwin) diff --git a/NOTICES.txt b/NOTICES.txt index b0454a42a7..9e2a0db3ec 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -41,7 +41,7 @@ Section 4: MIT >>> https://rubygems.org/gems/kubeclient/versions/4.11.0 >>> https://rubygems.org/gems/listen/versions/3.8.0 >>> https://rubygems.org/gems/loofah/versions/2.21.3 ->>> https://rubygems.org/gems/net-ldap/versions/0.17.0 +>>> https://rubygems.org/gems/net-ldap/versions/0.18.0 >>> https://rubygems.org/gems/nokogiri/versions/1.15.3-x86_64-darwin >>> https://rubygems.org/gems/openid_connect/versions/1.3.0 >>> https://rubygems.org/gems/rack-rewrite/versions/1.5.1 @@ -636,7 +636,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> https://rubygems.org/gems/net-ldap/versions/0.17.0 +>>> https://rubygems.org/gems/net-ldap/versions/0.18.0 Copyright 2006–2011 by Francis Cianfrocca and other contributors. @@ -1212,4 +1212,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/VERSION_APPLIANCE b/VERSION_APPLIANCE index 819e07a224..f4864e5cfb 100644 --- a/VERSION_APPLIANCE +++ b/VERSION_APPLIANCE @@ -1 +1 @@ -5.0 +PR-57 diff --git a/app/views/status/index.html.erb b/app/views/status/index.html.erb index a36a3c2c10..d7084d7b4f 100644 --- a/app/views/status/index.html.erb +++ b/app/views/status/index.html.erb @@ -58,6 +58,7 @@
Details:
Version <%= ENV["CONJUR_VERSION_DISPLAY"] %>
API Version "><%= ENV["API_VERSION"] %> +
FIPS mode <%= ENV["FIPS_MODE_STATUS"] %>
More Info: