Skip to content

Commit 20ea5fd

Browse files
anoopcs9anoopcs9
committed
Merge branch 'master' into release
2 parents cae997d + 11d486d commit 20ea5fd

13 files changed

+38
-39
lines changed

‎images/ad-server/Containerfile.centos‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ ARG SAMBACC_VERSION_SUFFIX=""
55
ARG SAMBA_SPECIFICS=daemon_cli_debug_output
66
ARG INSTALL_CUSTOM_REPO=
77

8-
MAINTAINER John Mulligan <[email protected]>
9-
108
LABEL org.opencontainers.image.title="Samba ADDC container"
119
LABEL org.opencontainers.image.description="Samba ADDC container"
1210
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
11+
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
12+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
13+
LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan <[email protected]>"
1314

1415
COPY install-packages.sh /usr/local/bin/install-packages.sh
1516
RUN /usr/local/bin/install-packages.sh \

‎images/ad-server/Containerfile.fedora‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
FROM registry.fedoraproject.org/fedora:41
1+
FROM registry.fedoraproject.org/fedora:42
22
ARG INSTALL_PACKAGES_FROM=default
33
ARG SAMBA_VERSION_SUFFIX="-4.21.7"
44
ARG SAMBACC_VERSION_SUFFIX="-0.7-1.fc41"
55
ARG SAMBA_SPECIFICS=daemon_cli_debug_output
66
ARG INSTALL_CUSTOM_REPO=
77

8-
MAINTAINER John Mulligan <[email protected]>
9-
108
LABEL org.opencontainers.image.title="Samba ADDC container"
119
LABEL org.opencontainers.image.description="Samba ADDC container"
1210
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
11+
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
12+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
13+
LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan <[email protected]>"
1314

1415
COPY install-packages.sh /usr/local/bin/install-packages.sh
1516
RUN /usr/local/bin/install-packages.sh \

‎images/ad-server/Containerfile.opensuse‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
FROM opensuse/tumbleweed
99
ARG SAMBA_SPECIFICS=daemon_cli_debug_output
1010

11-
MAINTAINER David Mulder <[email protected]>
12-
1311
# labelprefix=org.opensuse.samba-ad-server
1412
LABEL org.opencontainers.image.title="Samba ADDC container"
1513
LABEL org.opencontainers.image.description="Samba ADDC container"
1614
LABEL org.opencontainers.image.created="%BUILDTIME%"
1715
LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%"
1816
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
17+
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
18+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
19+
LABEL org.opencontainers.image.authors="David Mulder <[email protected]>"
1920
LABEL org.openbuildservice.disturl="%DISTURL%"
2021
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%"
2122
# endlabelprefix

‎images/client/Containerfile.centos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
FROM quay.io/centos/centos:stream9
44

5-
MAINTAINER Michael Adam <[email protected]>
6-
75
LABEL org.opencontainers.image.title="Samba Client container"
86
LABEL org.opencontainers.image.description="Samba Client container"
97
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
108
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
9+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
10+
LABEL org.opencontainers.image.authors="The samba-container team, Michael Adam <[email protected]>"
1111

1212

1313
# https://github.com/samba-in-kubernetes/samba-container/issues/96#issuecomment-1387467396

‎images/client/Containerfile.fedora‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Copyright 2020 Michael Adam
22

3-
FROM registry.fedoraproject.org/fedora:41
4-
5-
MAINTAINER Michael Adam <[email protected]>
3+
FROM registry.fedoraproject.org/fedora:42
64

75
LABEL org.opencontainers.image.title="Samba Client container"
86
LABEL org.opencontainers.image.description="Samba Client container"
97
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
108
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
9+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
10+
LABEL org.opencontainers.image.authors="The samba-container team, Michael Adam <[email protected]>"
1111

1212

1313
# https://github.com/samba-in-kubernetes/samba-container/issues/96#issuecomment-1387467396

‎images/client/Containerfile.opensuse‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66

77
# OBS doesn't allow a fully qualified image registry name for the offline build
88
FROM opensuse/tumbleweed
9-
MAINTAINER David Mulder <[email protected]>
109

1110
# labelprefix=org.opensuse.samba-client
1211
LABEL org.opencontainers.image.title="Samba Client container"
1312
LABEL org.opencontainers.image.description="Samba Client container"
1413
LABEL org.opencontainers.image.created="%BUILDTIME%"
1514
LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%"
1615
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
16+
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
17+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
18+
LABEL org.opencontainers.image.authors="David Mulder <[email protected]>"
1719
LABEL org.openbuildservice.disturl="%DISTURL%"
1820
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-client:%%PKG_VERSION%%-%RELEASE%"
1921
# endlabelprefix

‎images/server/Containerfile.centos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ ARG INSTALL_CUSTOM_REPOS=
77
ARG PACKAGE_SELECTION=
88
ARG CEPH_FROM_CUSTOM=0
99

10-
MAINTAINER John Mulligan <[email protected]>
11-
1210
LABEL org.opencontainers.image.title="Samba container"
1311
LABEL org.opencontainers.image.description="Samba container"
1412
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
1513
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
14+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
15+
LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan <[email protected]>"
1616

1717

1818
COPY smb.conf /etc/samba/smb.conf

‎images/server/Containerfile.fedora‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
FROM registry.fedoraproject.org/fedora:41
1+
FROM registry.fedoraproject.org/fedora:42
22
ARG INSTALL_PACKAGES_FROM=default
33
ARG SAMBA_VERSION_SUFFIX="-4.21.7"
44
ARG SAMBACC_VERSION_SUFFIX="-0.7-1.fc41"
55
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
66
ARG INSTALL_CUSTOM_REPO=
77
ARG PACKAGE_SELECTION=
88

9-
MAINTAINER John Mulligan <[email protected]>
10-
119
LABEL org.opencontainers.image.title="Samba container"
1210
LABEL org.opencontainers.image.description="Samba container"
1311
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
1412
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
13+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
14+
LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan <[email protected]>"
15+
1516

1617
COPY smb.conf /etc/samba/smb.conf
1718
COPY install-packages.sh /usr/local/bin/install-packages.sh

‎images/server/Containerfile.opensuse‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
FROM opensuse/tumbleweed
99
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
1010

11-
MAINTAINER David Mulder <[email protected]>
12-
1311
# labelprefix=org.opensuse.samba-server
1412
LABEL org.opencontainers.image.title="Samba container"
1513
LABEL org.opencontainers.image.description="Samba container"
1614
LABEL org.opencontainers.image.created="%BUILDTIME%"
1715
LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%"
1816
LABEL org.opencontainers.image.vendor="Samba in Kubernetes"
17+
LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container"
18+
LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container"
19+
LABEL org.opencontainers.image.authors="David Mulder <[email protected]>"
1920
LABEL org.openbuildservice.disturl="%DISTURL%"
2021
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-server:%%PKG_VERSION%%-%RELEASE%"
2122
# endlabelprefix

‎images/server/install-packages.sh‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ get_sig_samba_repo() {
7474
fi
7575
}
7676

77-
# shellcheck disable=SC2120
7877
get_distro_ceph_repo() {
7978
if [[ "${OS_BASE}" = centos ]]; then
8079
if [[ -z $1 ]]; then
@@ -160,12 +159,8 @@ case "${install_packages_from}" in
160159
package_selection=${package_selection:-custom-devbuilds}
161160
;;
162161
ceph20)
163-
get_sig_samba_repo "4.22"
164-
# Replace the following with 'get_distro_ceph_repo "tentacle"'
165-
# once tentacle builds are out and remove the shellcheck waiver
166-
# for get_distro_ceph_repo
167-
CEPH_REPO_REF=tentacle
168-
get_ceph_shaman_repo
162+
get_sig_samba_repo "4.23"
163+
get_distro_ceph_repo "tentacle"
169164
package_selection=${package_selection:-stable}
170165
;;
171166
*)
@@ -203,17 +198,9 @@ case "${package_selection}-${OS_BASE}" in
203198
*-fedora|allvfs-*)
204199
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
205200
;;
206-
*devbuilds-centos|forcedevbuilds-*|stable-*)
207-
# Enable libcephfs proxy for dev builds
201+
*-centos|forcedevbuilds-*)
208202
support_packages+=(libcephfs-proxy2)
209-
# Fall through to next case
210-
;&
211-
nightly-centos|default-centos)
212203
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
213-
# these packages should be installed as deps. of sambacc extras
214-
# however, the sambacc builds do not enable the extras on centos atm.
215-
# Once this is fixed this line ought to be removed.
216-
support_packages+=(python3-pyyaml python3-tomli python3-rados)
217204
;;
218205
esac
219206

0 commit comments

Comments
 (0)