Skip to content

Commit

Permalink
fix merge conflict mistake in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenjcumming authored Apr 24, 2024
1 parent f85a6ba commit 66daf64
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
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
# https://github.com/department-of-veterans-affairs/va.gov-team/issues/3032

FROM ruby:3.2.3-slim-bookworm AS rubyimg
FROM rubyimg AS modules

WORKDIR /tmp
Expand All @@ -28,10 +23,9 @@ RUN groupadd --gid $USER_ID nonroot \

WORKDIR /app

RUN echo "deb http://ftp.debian.org/debian testing main contrib non-free" >> /etc/apt/sources.list
RUN apt-get update
RUN apt-get install -y -t testing poppler-utils build-essential libpq-dev git curl wget ca-certificates-java file
RUN dpkg --configure -a && apt-get install -y -t bullseye imagemagick pdftk \
RUN apt-get update --fix-missing
RUN apt-get install -y poppler-utils build-essential libpq-dev git curl wget ca-certificates-java file \
imagemagick pdftk \
&& apt-get clean \
&& rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down

0 comments on commit 66daf64

Please sign in to comment.