Skip to content

Commit

Permalink
Move apt-get operations earlier to promote caching/sharing of the lay…
Browse files Browse the repository at this point in the history 
…er between versions
  • Loading branch information
@wiktorn
wiktorn committed Sep 21, 2019
1 parent cfcd78f commit c9eb697
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions 0.7.53/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.53.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.53.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.54.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.10.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.10.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.54.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.12.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.12.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.54.13/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.13.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.13.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.54.9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.9.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.9.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.54/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.54.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.1.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.1.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.2.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.2.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.3.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.3.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.4.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.4.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.5.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.5.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.6.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.6.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.7.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.7.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions 0.7.55/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v0.7.55.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM nginx:1.14

RUN addgroup overpass && adduser --home /db --disabled-password --gecos overpass --ingroup overpass overpass

ADD http://dev.overpass-api.de/releases/osm-3s_v{version}.tar.gz /app/src.tar.gz

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -56,6 +54,8 @@ RUN apt-get update \
&& rm -rf /app/src /app/src.tar.gz \
&& rm -rf /var/lib/apt/lists/*

ADD http://dev.overpass-api.de/releases/osm-3s_v{version}.tar.gz /app/src.tar.gz

COPY requirements.txt /app/

RUN python3 -m venv /app/venv \
Expand Down

1 comment on commit c9eb697

@gdegoulet
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

It was not a good idea to ADD /app/src.tar.gz with "ADD http://dev.overpass-api.de/releases/osm-3s_v{version}.tar.gz /app/src.tar.gz" (line 57 in file Dockerfile.template )
AFTER trying to uncompress it (line 32) : it doesn't build anymore ...

tar (child): ../src.tar.gz: Cannot open: No such file or directory
tar (child): Error is not recoverable: exiting now
tar: Child returned status 2
tar: Error is not recoverable: exiting now

Please sign in to comment.