Skip to content

Commit 9501576

Browse files
phlogistonjohnmergify[bot]
authored andcommitted
images: enable PACKAGE_SELECTION build var in server image
Signed-off-by: John Mulligan <[email protected]>
1 parent bc7f139 commit 9501576

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

images/server/Containerfile.centos

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG SAMBA_VERSION_SUFFIX=""
44
ARG SAMBACC_VERSION_SUFFIX=""
55
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
66
ARG INSTALL_CUSTOM_REPO=
7+
ARG PACKAGE_SELECTION=
78

89
MAINTAINER John Mulligan <[email protected]>
910

@@ -18,7 +19,8 @@ COPY install-packages.sh /usr/local/bin/install-packages.sh
1819
RUN /usr/local/bin/install-packages.sh \
1920
"${INSTALL_PACKAGES_FROM}" \
2021
"${SAMBA_VERSION_SUFFIX}" \
21-
"${INSTALL_CUSTOM_REPO}"
22+
"${INSTALL_CUSTOM_REPO}" \
23+
"${PACKAGE_SELECTION}"
2224

2325
# If you want to install a custom version of sambacc into this image mount
2426
# a directory containing a sambacc RPM, or a sambacc wheel, or a .repo

images/server/Containerfile.fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG SAMBA_VERSION_SUFFIX=""
44
ARG SAMBACC_VERSION_SUFFIX=""
55
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
66
ARG INSTALL_CUSTOM_REPO=
7+
ARG PACKAGE_SELECTION=
78

89
MAINTAINER John Mulligan <[email protected]>
910

@@ -17,7 +18,8 @@ COPY install-packages.sh /usr/local/bin/install-packages.sh
1718
RUN /usr/local/bin/install-packages.sh \
1819
"${INSTALL_PACKAGES_FROM}" \
1920
"${SAMBA_VERSION_SUFFIX}" \
20-
"${INSTALL_CUSTOM_REPO}"
21+
"${INSTALL_CUSTOM_REPO}" \
22+
"${PACKAGE_SELECTION}"
2123

2224
# If you want to install a custom version of sambacc into this image mount
2325
# a directory containing a sambacc RPM, or a sambacc wheel, or a .repo

0 commit comments

Comments
 (0)