Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replaces nss_wrapper with nss_wrapper-libs #151

Merged
merged 2 commits into from
Sep 19, 2024
Merged

replaces nss_wrapper with nss_wrapper-libs #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87e34ab
Replace nss_wrapper with nss_wrapper-libs
phracek Sep 18, 2024
9806205
Add generated sources
phracek Sep 18, 2024
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 6/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
name="sclorg/varnish-6-c9s" \
maintainer="Uhliarik Lubos <luhliari@redhat.com>"

RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \
RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils varnish gcc" && \
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
fix-permissions $VARNISH_CONFIGURATION_PATH && \
Expand Down
2 changes: 1 addition & 1 deletion 6/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
name="rhel8/varnish-6" \
maintainer="Uhliarik Lubos <luhliari@redhat.com>"

RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \
RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils varnish gcc" && \
yum -y module enable varnish:6 && \
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 6/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
name="rhel9/varnish-6" \
maintainer="Uhliarik Lubos <luhliari@redhat.com>"

RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \
RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils varnish gcc" && \
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
fix-permissions $VARNISH_CONFIGURATION_PATH && \
Expand Down
2 changes: 1 addition & 1 deletion 7/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
name="sclorg/varnish-7-c10s" \
maintainer="Uhliarik Lubos <luhliari@redhat.com>"

RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \
RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils varnish gcc" && \
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
fix-permissions $VARNISH_CONFIGURATION_PATH && \
Expand Down
2 changes: 1 addition & 1 deletion 7/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
name="fedora/varnish-7" \
maintainer="Uhliarik Lubos <luhliari@redhat.com>"

RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish" && \
RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils varnish" && \
dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
fix-permissions $VARNISH_CONFIGURATION_PATH && \
Expand Down
10 changes: 5 additions & 5 deletions specs/multispec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ specs:
distros:
- fedora-39-x86_64
s2i_base: quay.io/fedora/s2i-core:39
install_pkgs: "gettext hostname nss_wrapper bind-utils varnish"
install_pkgs: "gettext hostname nss_wrapper-libs bind-utils varnish"
img_name: "fedora/varnish-7"
full_img_name: "quay.io/{{ spec.img_name }}"
etc_path: /etc
Expand All @@ -16,7 +16,7 @@ specs:
s2i_base: ubi8/s2i-core
from_tag: "1"
prod: "rhel8"
install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
install_pkgs: "gettext hostname nss_wrapper-libs bind-utils varnish gcc"
repo_setup: yum -y module enable varnish:6 && \
img_name: "{{ spec.prod }}/varnish-{{ spec.version }}"
full_img_name: "{{ spec.img_name }}"
Expand All @@ -27,7 +27,7 @@ specs:
s2i_base: ubi9/s2i-core
from_tag: "1"
prod: "rhel9"
install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
install_pkgs: "gettext hostname nss_wrapper-libs bind-utils varnish gcc"
img_name: "{{ spec.prod }}/varnish-{{ spec.version }}"
full_img_name: "{{ spec.img_name }}"
etc_path: /etc
Expand All @@ -40,7 +40,7 @@ specs:
org: "sclorg"
from_tag: "c9s"
prod: "c9s"
install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
install_pkgs: "gettext hostname nss_wrapper-libs bind-utils varnish gcc"
img_name: "{{ spec.org }}/varnish-{{ spec.version }}-{{ spec.prod }}"
full_img_name: "quay.io/{{ spec.img_name }}"
etc_path: /etc
Expand All @@ -53,7 +53,7 @@ specs:
org: "sclorg"
from_tag: "c10s"
prod: "c10s"
install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
install_pkgs: "gettext hostname nss_wrapper-libs bind-utils varnish gcc"
img_name: "{{ spec.org }}/varnish-{{ spec.version }}-{{ spec.prod }}"
full_img_name: "quay.io/{{ spec.img_name }}"
etc_path: /etc
Expand Down