Skip to content

Commit a2c1f9a

Browse files
phlogistonjohnmergify[bot]
authored andcommitted
images: support a SAMBACC_VERSION_SUFFIX to force a sambacc version
Add a SAMBACC_VERSION_SUFFIX variable like the SAMBA_VERSION_SUFFIX variable to support requiring a particular sambacc version. Signed-off-by: John Mulligan <[email protected]>
1 parent 0956175 commit a2c1f9a

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

images/ad-server/Containerfile.fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:37
22
ARG INSTALL_PACKAGES_FROM=default
33
ARG SAMBA_VERSION_SUFFIX=""
4+
ARG SAMBACC_VERSION_SUFFIX=""
45
ARG SAMBA_SPECIFICS=
56
ARG INSTALL_CUSTOM_REPO=
67

@@ -25,7 +26,8 @@ RUN /usr/local/bin/install-packages.sh \
2526
COPY .common/install-sambacc-common.sh /usr/local/bin/install-sambacc-common.sh
2627
COPY install-sambacc.sh /usr/local/bin/install-sambacc.sh
2728
RUN /usr/local/bin/install-sambacc.sh \
28-
"/tmp/sambacc-dist-latest"
29+
"/tmp/sambacc-dist-latest" \
30+
"${SAMBACC_VERSION_SUFFIX}"
2931

3032

3133
ENV SAMBACC_CONFIG="/etc/samba/container.json:/etc/samba/users.json"

images/server/Containerfile.centos

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM quay.io/centos/centos:stream9
22
ARG INSTALL_PACKAGES_FROM=default
33
ARG SAMBA_VERSION_SUFFIX=""
4+
ARG SAMBACC_VERSION_SUFFIX=""
45
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
56
ARG INSTALL_CUSTOM_REPO=
67

@@ -28,7 +29,8 @@ RUN /usr/local/bin/install-packages.sh \
2829
COPY .common/install-sambacc-common.sh /usr/local/bin/install-sambacc-common.sh
2930
COPY install-sambacc.sh /usr/local/bin/install-sambacc.sh
3031
RUN /usr/local/bin/install-sambacc.sh \
31-
"/tmp/sambacc-dist-latest"
32+
"/tmp/sambacc-dist-latest" \
33+
"${SAMBACC_VERSION_SUFFIX}"
3234

3335

3436
VOLUME ["/share"]

images/server/Containerfile.fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:37
22
ARG INSTALL_PACKAGES_FROM=default
33
ARG SAMBA_VERSION_SUFFIX=""
4+
ARG SAMBACC_VERSION_SUFFIX=""
45
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
56
ARG INSTALL_CUSTOM_REPO=
67

@@ -27,7 +28,8 @@ RUN /usr/local/bin/install-packages.sh \
2728
COPY .common/install-sambacc-common.sh /usr/local/bin/install-sambacc-common.sh
2829
COPY install-sambacc.sh /usr/local/bin/install-sambacc.sh
2930
RUN /usr/local/bin/install-sambacc.sh \
30-
"/tmp/sambacc-dist-latest"
31+
"/tmp/sambacc-dist-latest" \
32+
"${SAMBACC_VERSION_SUFFIX}"
3133

3234

3335
VOLUME ["/share"]

0 commit comments

Comments
 (0)