mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-11 01:31:39 -05:00
Resolve conflict
Resolve conflict, add curl
This commit is contained in:
parent
47704d2297
commit
d90413bfe1
2 changed files with 2 additions and 0 deletions
|
|
@ -15,6 +15,7 @@ ENV PGSSENCMODE=disable
|
||||||
RUN apt-get update -qq \
|
RUN apt-get update -qq \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \
|
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
curl \
|
||||||
wget \
|
wget \
|
||||||
build-essential \
|
build-essential \
|
||||||
git \
|
git \
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ ENV RAILS_ENV=production
|
||||||
RUN apt-get update -qq \
|
RUN apt-get update -qq \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \
|
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
curl \
|
||||||
wget \
|
wget \
|
||||||
build-essential \
|
build-essential \
|
||||||
git \
|
git \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue