Skip to content

Commit

Permalink
Make docker apt version pinning less strict (#3889)
Browse files Browse the repository at this point in the history
* Make docker apt version pinning less strict

* Single quote versioned apt-get install packages

Co-authored-by: Michael Matloka <dev@twixes.com>
  • Loading branch information
adrienbrault and Twixes authored Apr 7, 2021
1 parent 6a7e513 commit 864dd60
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ WORKDIR /code/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl=7.64.0-4+deb10u2 git=1:2.20.1-2+deb10u3 build-essential=12.6 \
&& apt-get install -y --no-install-recommends 'curl=7.*' 'git=1:2.*' 'build-essential=12.6' \
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
&& apt-get update \
&& apt-get install -y --no-install-recommends nodejs=14.16.0-1nodesource1 postgresql-client-12=12.6-1.pgdg100+1 \
&& apt-get install -y --no-install-recommends 'nodejs=14.*' 'postgresql-client-12=12.*' \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g yarn@1 \
&& yarn config set network-timeout 300000 \
Expand Down
4 changes: 2 additions & 2 deletions production.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ COPY . /code/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl=7.64.0-4+deb10u2 git=1:2.20.1-2+deb10u3 build-essential=12.6 \
&& apt-get install -y --no-install-recommends 'curl=7.*' 'git=1:2.*' 'build-essential=12.6' \
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y --no-install-recommends nodejs=14.16.0-1nodesource1 \
&& apt-get install -y --no-install-recommends 'nodejs=14.*' \
&& npm install -g yarn@1 \
&& yarn config set network-timeout 300000 \
&& yarn --frozen-lockfile \
Expand Down

0 comments on commit 864dd60

Please sign in to comment.