From e096e2bab384bdbc0031fabdc21a05934ddfb6b5 Mon Sep 17 00:00:00 2001 From: Mr Bot Date: Mon, 23 Sep 2019 16:31:14 +0300 Subject: [PATCH] nginx testing --- balancer/experemental/Dockerfile | 23 +++++++++++++++-------- epicmorg/devel/Dockerfile | 5 ++++- epicmorg/prod/Dockerfile | 5 ++++- teamcity-agent/Dockerfile | 6 ++++-- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/balancer/experemental/Dockerfile b/balancer/experemental/Dockerfile index b2c733490..477936147 100644 --- a/balancer/experemental/Dockerfile +++ b/balancer/experemental/Dockerfile @@ -146,15 +146,22 @@ RUN cd ${NGINX_SRC_DIR} && \ cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb +FROM epicmorg/prod +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +COPY --from-build -#FROM epicmorg/prod -#LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -#ARG DEBIAN_FRONTEND=noninteractive +final config +VOLUME ["/var/cache/nginx"] +EXPOSE 80 443 -#final config -#VOLUME ["/var/cache/nginx"] -#EXPOSE 80 443 - -#CMD ["nginx", "-g", "daemon off;"] +CMD ["nginx", "-g", "daemon off;"] diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/Dockerfile index 82a548011..c2746a632 100644 --- a/epicmorg/devel/Dockerfile +++ b/epicmorg/devel/Dockerfile @@ -114,4 +114,7 @@ RUN apt-get update && \ ################################################################## # cleaninig up ################################################################## -RUN rm -rfv /var/lib/apt/lists/* +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod/Dockerfile b/epicmorg/prod/Dockerfile index 22844e827..f069136fb 100644 --- a/epicmorg/prod/Dockerfile +++ b/epicmorg/prod/Dockerfile @@ -65,4 +65,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ ################################################################## # cleaninig up ################################################################## -RUN rm -rfv /var/lib/apt/lists/* +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index 669da47f6..8da2521e8 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -97,8 +97,10 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/l ################################################################## # cleaninig up ################################################################## -RUN rm -rfv /var/lib/apt/lists/* - +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb CMD ["/run-services.sh"]