Skip to content

Commit e7d8db9

Browse files
committed
This pull request replaces nss_wrapper with nss_wrapper-libs.
Less dependency and uncessary footprint Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent fe178bb commit e7d8db9

11 files changed

+11
-11
lines changed

1.22-micro/Dockerfile.rhel8

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN mkdir -p /mnt/rootfs
55
# testing packages in the following repo, but using packages from the distro meanwhile
66
# ADD https://copr.fedorainfracloud.org/coprs/hhorak/nginx-micro/repo/epel-8/hhorak-nginx-micro-epel-8.repo /etc/yum.repos.d/hhorak-nginx-micro-epel-8.repo
77
RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \
8-
INSTALL_PKGS="$MICRO_PKGS @nginx:1.22/common findutils hostname nss_wrapper gettext bind-utils" && \
8+
INSTALL_PKGS="$MICRO_PKGS @nginx:1.22/common findutils hostname nss_wrapper-libs gettext bind-utils" && \
99
dnf --installroot /mnt/rootfs --releasever 8 --setopt install_weak_deps=false --nodocs module enable nginx:1.22 -y && \
1010
dnf --installroot /mnt/rootfs --releasever 8 --setopt install_weak_deps=false --nodocs install $INSTALL_PKGS -y && \
1111
dnf -y --installroot /mnt/rootfs clean all && \

1.22/Dockerfile.fedora

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
4444
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4545

4646
RUN dnf install -y gettext hostname && \
47-
INSTALL_PKGS="nss_wrapper bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
47+
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
4848
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4949
rpm -V $INSTALL_PKGS && \
5050
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.22/Dockerfile.rhel8

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.22/Dockerfile.rhel9

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.24/Dockerfile.fedora

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
4444
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4545

4646
RUN dnf install -y gettext hostname && \
47-
INSTALL_PKGS="nss_wrapper bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
47+
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
4848
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4949
rpm -V $INSTALL_PKGS && \
5050
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.24/Dockerfile.rhel8

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.24/Dockerfile.rhel9

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.26/Dockerfile.c10s

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
# Modules does not exist
42-
RUN INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
RUN INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.26/Dockerfile.fedora

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
4040
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4141

4242
RUN dnf install -y gettext hostname && \
43-
INSTALL_PKGS="nss_wrapper bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
43+
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
4444
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4545
rpm -V $INSTALL_PKGS && \
4646
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.26/Dockerfile.rhel8

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

1.26/Dockerfile.rhel9

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
3939
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
4040

4141
RUN yum -y module enable nginx:$NGINX_VERSION && \
42-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
42+
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
4343
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
4444
rpm -V $INSTALL_PKGS && \
4545
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \

0 commit comments

Comments
 (0)