Browse Source
Merge pull request #6784 from smatvienko-tb/docker-optimization-no-install-recommend
[3.4] Dockerfile optimization: --no-install-recommends
pull/6797/head
Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
4 deletions
-
msa/tb/docker-cassandra/Dockerfile
-
msa/tb/docker-postgres/Dockerfile
|
|
|
@ -44,15 +44,17 @@ ENV CASSANDRA_LOG=/var/log/cassandra |
|
|
|
COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ |
|
|
|
|
|
|
|
RUN apt-get update \ |
|
|
|
&& apt-get install -y curl nmap procps gnupg2 \ |
|
|
|
&& apt-get install -y --no-install-recommends curl nmap procps gnupg2 \ |
|
|
|
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \ |
|
|
|
&& curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ |
|
|
|
&& echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null \ |
|
|
|
&& curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - \ |
|
|
|
&& apt-get update \ |
|
|
|
&& apt-get install -y cassandra cassandra-tools postgresql-12 \ |
|
|
|
&& apt-get install -y --no-install-recommends cassandra cassandra-tools postgresql-${PG_MAJOR} \ |
|
|
|
&& rm -rf /var/lib/apt/lists/* \ |
|
|
|
&& update-rc.d cassandra disable \ |
|
|
|
&& update-rc.d postgresql disable \ |
|
|
|
&& apt-get purge -y --auto-remove \ |
|
|
|
&& sed -i.old '/ulimit/d' /etc/init.d/cassandra \ |
|
|
|
&& chmod a+x /tmp/*.sh \ |
|
|
|
&& mv /tmp/start-tb.sh /usr/bin \ |
|
|
|
|
|
|
|
@ -36,12 +36,14 @@ ENV PGLOG=/var/log/postgres |
|
|
|
COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ |
|
|
|
|
|
|
|
RUN apt-get update \ |
|
|
|
&& apt-get install -y curl gnupg2 \ |
|
|
|
&& apt-get install -y --no-install-recommends curl gnupg2 \ |
|
|
|
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \ |
|
|
|
&& curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ |
|
|
|
&& apt-get update \ |
|
|
|
&& apt-get install -y postgresql-12 \ |
|
|
|
&& apt-get install -y --no-install-recommends postgresql-${PG_MAJOR} \ |
|
|
|
&& rm -rf /var/lib/apt/lists/* \ |
|
|
|
&& update-rc.d postgresql disable \ |
|
|
|
&& apt-get purge -y --auto-remove \ |
|
|
|
&& chmod a+x /tmp/*.sh \ |
|
|
|
&& mv /tmp/start-tb.sh /usr/bin \ |
|
|
|
&& mv /tmp/upgrade-tb.sh /usr/bin \ |
|
|
|
|
