Skip to content

Commit bf1f26d

Browse files
committed
do not install recommended dependencies,
instead of purging unnecessary packages
1 parent fce9d88 commit bf1f26d

File tree

6 files changed

+18
-23
lines changed

6 files changed

+18
-23
lines changed

10/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,13 +135,12 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
; \
143143
\
144-
apt-get purge --yes libmariadbclient18 mysql-common ; \
145144
apt-get autoremove --yes; \
146145
rm -rf /var/lib/apt/lists/*; \
147146
\

11/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,13 +135,12 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
; \
143143
\
144-
apt-get purge --yes libmariadbclient18 mysql-common ; \
145144
apt-get autoremove --yes; \
146145
rm -rf /var/lib/apt/lists/*; \
147146
\

12/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,13 +135,12 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
; \
143143
\
144-
apt-get purge --yes libmariadb3 mariadb-common mysql-common ; \
145144
apt-get autoremove --yes; \
146145
rm -rf /var/lib/apt/lists/*; \
147146
\

9.5/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,14 +135,13 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
"postgresql-contrib-$PG_MAJOR=$PG_VERSION" \
143143
; \
144144
\
145-
apt-get purge --yes libmariadbclient18 mysql-common ; \
146145
apt-get autoremove --yes; \
147146
rm -rf /var/lib/apt/lists/*; \
148147
\

9.6/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,14 +135,13 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
"postgresql-contrib-$PG_MAJOR=$PG_VERSION" \
143143
; \
144144
\
145-
apt-get purge --yes libmariadbclient18 mysql-common ; \
146145
apt-get autoremove --yes; \
147146
rm -rf /var/lib/apt/lists/*; \
148147
\

Dockerfile-debian.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
4545
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
4646
fi; \
47-
apt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \
47+
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

@@ -135,9 +135,9 @@ RUN set -ex; \
135135
;; \
136136
esac; \
137137
\
138-
apt-get install -y postgresql-common; \
138+
apt-get install -y --no-install-recommends postgresql-common; \
139139
sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
140-
apt-get install -y \
140+
apt-get install -y --no-install-recommends \
141141
"postgresql-$PG_MAJOR=$PG_VERSION" \
142142
"postgresql-contrib-$PG_MAJOR=$PG_VERSION" \
143143
; \

0 commit comments

Comments
 (0)