Skip to content

Commit

Permalink
Upgrade Debian to Bookworm (master) (#16454)
Browse files Browse the repository at this point in the history
* update debian to bookworm

* add test_client.p12

* update ruby version to 2.3.3

* testing with connect_vbms 0.2.0.rc

* add back ruby platform to Gemfile.lock

* update connect_vbms gem to ad hoc fork

* add trailing new line to Dockerfile
  • Loading branch information
stevenjcumming authored Apr 24, 2024
1 parent 994c71f commit c1787f0
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 28 deletions.
17 changes: 5 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG RELEASE=bullseye
FROM ruby:3.2.3-slim-${RELEASE} as rubyimg
FROM ruby:3.2.3-slim-bookworm as rubyimg

# XXX: using stretch here for pdftk dep, which is not availible after
# stretch (or in alpine) and is switched automatically to pdftk-java in buster
Expand All @@ -18,21 +17,15 @@ RUN find modules -type f ! \( -name Gemfile -o -name "*.gemspec" -o -path "*/lib
# shared build/settings for all child images, reuse these layers yo
###
FROM rubyimg AS base
ARG RELEASE
ENV RELEASE="$RELEASE"

ARG userid=993
SHELL ["/bin/bash", "-c"]
RUN groupadd -g $userid -r vets-api && \
useradd -u $userid -r -m -d /srv/vets-api -g vets-api vets-api
RUN echo "APT::Default-Release \"${RELEASE}\";" >> /etc/apt/apt.conf.d/99defaultrelease
RUN mv /etc/apt/sources.list /etc/apt/sources.list.d/stable.list
RUN echo "deb http://ftp.debian.org/debian testing main contrib non-free" >> /etc/apt/sources.list.d/testing.list
RUN echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/unstable.list
RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -t "${RELEASE}" \
dumb-init imagemagick pdftk poppler-utils curl libpq5 vim libboost-all-dev \
clamav clamdscan clamav-daemon
RUN apt-get update --fix-missing
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates-java && \
DEBIAN_FRONTEND=noninteractive apt-get install -y dumb-init imagemagick pdftk poppler-utils curl \
libpq5 vim libboost-all-dev clamav clamdscan clamav-daemon

# The pki work below is for parity with the non-docker BRD deploys to mount certs into
# the container, we need to get rid of it and refactor the configuration bits into
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gem 'carrierwave-aws'
gem 'clam_scan'
gem 'combine_pdf'
gem 'config'
gem 'connect_vbms', git: 'https://github.com/department-of-veterans-affairs/connect_vbms.git', branch: 'master', require: 'vbms'
gem 'connect_vbms', git: 'https://github.com/adhocteam/connect_vbms', tag: 'v2.0.0.rc', require: 'vbms'
gem 'date_validator'
gem 'ddtrace'
gem 'dogstatsd-ruby', '5.6.1'
Expand Down
31 changes: 16 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
GIT
remote: https://github.com/adhocteam/connect_vbms
revision: 6e5dc751afaf0da9c7cbc10c94b909f114f3a156
tag: v2.0.0.rc
specs:
connect_vbms (2.0.0.rc)
httpclient (~> 2.8.0)
httpi (~> 2.4)
mail
nokogiri (>= 1.8.4)
nori
xmldsig (~> 0.3.1)
xmlenc

GIT
remote: https://github.com/department-of-veterans-affairs/apivore
revision: f8ccd476f6c5301f5ebe4e2dd5b30ff0e567ffc1
Expand Down Expand Up @@ -30,20 +44,6 @@ GIT
nokogiri (>= 1.13.6)
savon (= 2.12)

GIT
remote: https://github.com/department-of-veterans-affairs/connect_vbms.git
revision: 1834cf61310001c82e2e96d665518407c3bce947
branch: master
specs:
connect_vbms (1.4.0)
httpclient (~> 2.8.0)
httpi (~> 2.4)
mail
nokogiri (>= 1.8.4)
nori
xmldsig (~> 0.3.1)
xmlenc

GIT
remote: https://github.com/department-of-veterans-affairs/fhir_client.git
revision: 52e0197dcb1f940a1f0b28bfa983699f0c199696
Expand Down Expand Up @@ -663,7 +663,8 @@ GEM
nokogiri (1.16.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nori (2.6.0)
nori (2.7.0)
bigdecimal
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
Expand Down
Binary file modified modules/claims_api/spec/fixtures/test_client.p12
Binary file not shown.

0 comments on commit c1787f0

Please sign in to comment.