Skip to content

Commit

Permalink
Merge pull request #24 from alphagov/use-debian-dockerimage
Browse files Browse the repository at this point in the history
Replace Alpine for Debian in our Dockerfile
  • Loading branch information
adrianclay authored Aug 9, 2018
2 parents 5098ece + 4657795 commit 8a4734d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ruby:2.5-alpine
FROM ruby:2.5
ARG BUNDLE_INSTALL_CMD
ENV RACK_ENV=development

WORKDIR /usr/src/app

COPY Gemfile Gemfile.lock .ruby-version ./
RUN apk --update --upgrade add build-base sqlite-dev tzdata nodejs && \
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
apt-get update && apt-get install -y apt-transport-https && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && apt-get install -y yarn && \
bundle check || ${BUNDLE_INSTALL_CMD} && \
npm install -g yarn && \
apk del build-base && \
find / -type f -iname \*.apk-new -delete && \
rm -rf /var/cache/apk/*
rm -rf /var/lib/apt/lists/*

COPY . .

Expand Down

0 comments on commit 8a4734d

Please sign in to comment.