Skip to content

Commit

Permalink
images/server: Switch to CentOS Stream 9 as base image
Browse files Browse the repository at this point in the history
Signed-off-by: Anoop C S <anoopcs@samba.org>
  • Loading branch information
anoopcs9 committed Jan 19, 2023
1 parent be9386b commit 075b655
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion images/server/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG SAMBACC_REPO=https://github.com/samba-in-kubernetes/sambacc
RUN SAMBACC_DISTNAME=latest \
/usr/local/bin/build.sh ${SAMBACC_VER} ${SAMBACC_REPO}

FROM registry.fedoraproject.org/fedora:36
FROM quay.io/centos/centos:stream9
ARG INSTALL_PACKAGES_FROM=default
ARG SAMBA_VERSION_SUFFIX=""
ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
Expand Down
6 changes: 3 additions & 3 deletions images/server/install-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ get_custom_repo() {
url="$1"
fname="$(basename "$url")"
dest="/etc/yum.repos.d/${fname}"
dnf install --setopt=install_weak_deps=False -y curl
curl -L "$url" -o "$dest"
}

Expand All @@ -17,14 +16,15 @@ case "${install_packages_from}" in
samba-nightly)
# unset version suffix for nightly builds
samba_version_suffix=""
get_custom_repo "https://artifacts.ci.centos.org/samba/pkgs/master/fedora/samba-nightly-master.repo"
get_custom_repo "https://artifacts.ci.centos.org/samba/pkgs/master/centos/samba-nightly-master.repo"
;;
custom-repo)
get_custom_repo "${install_custom_repo}"
;;
esac

dnf install --setopt=install_weak_deps=False -y \
dnf --enablerepo=crb --enablerepo=resilientstorage \
install --setopt=install_weak_deps=False -y \
findutils \
python-pip \
python3-jsonschema \
Expand Down

0 comments on commit 075b655

Please sign in to comment.