Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1.20/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \

# Modules does not exist
# RUN yum -y module enable nginx:$NGINX_VERSION && \
RUN INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
RUN INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.20/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \

RUN dnf install -y gettext hostname && \
yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.20/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.20/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_LOG_PATH=/var/log/nginx \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-all-modules" && \
RUN INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-all-modules" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.20/test/start-hook-test-app/nginx-start/init.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setup_dns_env_var() {
if [ -z "$DNS_SERVER" ]; then
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | awk '{print $2}' | tr '\n' ' '`
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | cut -d " " -f 2 | tr '\n' ' '`
echo "Using system dns server ${DNS_SERVER}"
else
echo "Using user defined dns server: ${DNS_SERVER}"
Expand Down
4 changes: 2 additions & 2 deletions 1.22-micro/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FROM quay.io/centos/centos:stream9 AS build
RUN mkdir -p /mnt/rootfs
# this is an alternative build of some packages with even smaller footprint on RPM level
# ADD https://copr.fedorainfracloud.org/coprs/hhorak/nginx-micro/repo/centos-stream-9/hhorak-nginx-micro-centos-stream-9.repo /etc/yum.repos.d/hhorak-nginx-micro-centos-stream-9.repo
# INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs envsubst bind-utils" && \
# INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs envsubst " && \
RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \
INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs gettext bind-utils" && \
INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs gettext " && \
dnf --installroot /mnt/rootfs --releasever 9 --setopt install_weak_deps=false --nodocs module enable nginx:1.22 -y && \
dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 9 --setopt install_weak_deps=false --nodocs -y && \
dnf -y --installroot /mnt/rootfs clean all && \
Expand Down
4 changes: 2 additions & 2 deletions 1.22-micro/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FROM registry.fedoraproject.org/fedora:37 AS build
RUN mkdir -p /mnt/rootfs
# this is an alternative build of some packages with even smaller footprint on RPM level
# ADD https://copr.fedorainfracloud.org/coprs/hhorak/nginx-micro/repo/fedora-34/hhorak-nginx-micro-fedora-34.repo /etc/yum.repos.d/hhorak-nginx-micro-fedora-34.repo
# INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs envsubst bind-utils" && \
# INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs envsubst " && \
RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \
INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs gettext bind-utils" && \
INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs gettext " && \
dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 36 --setopt install_weak_deps=false --nodocs -y && \
dnf -y --installroot /mnt/rootfs clean all && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
Expand Down
2 changes: 1 addition & 1 deletion 1.22-micro/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN mkdir -p /mnt/rootfs
# testing packages in the following repo, but using packages from the distro meanwhile
# 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
RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \
INSTALL_PKGS="$MICRO_PKGS @nginx:1.22/common findutils hostname nss_wrapper-libs gettext bind-utils" && \
INSTALL_PKGS="$MICRO_PKGS @nginx:1.22/common findutils hostname nss_wrapper-libs gettext " && \
dnf --installroot /mnt/rootfs --releasever 8 --setopt install_weak_deps=false --nodocs module enable nginx:1.22 -y && \
dnf --installroot /mnt/rootfs --releasever 8 --setopt install_weak_deps=false --nodocs install $INSTALL_PKGS -y && \
dnf -y --installroot /mnt/rootfs clean all && \
Expand Down
2 changes: 1 addition & 1 deletion 1.22/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \

# Modules does not exist
RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.22/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN dnf install -y gettext hostname && \
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.22/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.22/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-all-modules" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-all-modules" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.22/test/start-hook-test-app/nginx-start/init.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setup_dns_env_var() {
if [ -z "$DNS_SERVER" ]; then
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | awk '{print $2}' | tr '\n' ' '`
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | cut -d " " -f 2 | tr '\n' ' '`
echo "Using system dns server ${DNS_SERVER}"
else
echo "Using user defined dns server: ${DNS_SERVER}"
Expand Down
2 changes: 1 addition & 1 deletion 1.24/Dockerfile.c8s
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.24/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \

# Modules does not exist
RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.24/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN dnf install -y gettext hostname && \
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.24/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.24/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-all-modules" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-all-modules" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.24/test/start-hook-test-app/nginx-start/init.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setup_dns_env_var() {
if [ -z "$DNS_SERVER" ]; then
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | awk '{print $2}' | tr '\n' ' '`
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | cut -d " " -f 2 | tr '\n' ' '`
echo "Using system dns server ${DNS_SERVER}"
else
echo "Using user defined dns server: ${DNS_SERVER}"
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.c10s
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

# Modules does not exist
RUN INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
RUN INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \

# Modules does not exist
RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-all-modules" && \
INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-all-modules" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN dnf install -y gettext hostname && \
INSTALL_PKGS="nss_wrapper-libs bind-utils nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.rhel10
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

# Modules does not exist
RUN INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
RUN INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

RUN yum -y module enable nginx:$NGINX_VERSION && \
INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-all-modules" && \
INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-all-modules" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
Expand Down
2 changes: 1 addition & 1 deletion 1.26/test/start-hook-test-app/nginx-start/init.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setup_dns_env_var() {
if [ -z "$DNS_SERVER" ]; then
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | awk '{print $2}' | tr '\n' ' '`
export DNS_SERVER=`cat /etc/resolv.conf | grep "nameserver " | cut -d " " -f 2 | tr '\n' ' '`
echo "Using system dns server ${DNS_SERVER}"
else
echo "Using user defined dns server: ${DNS_SERVER}"
Expand Down