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.

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

Set up a base distribution in the images #3292

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
13 changes: 13 additions & 0 deletions package/Dockerfile.submariner-operator
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG BASE_BRANCH
ARG FEDORA_VERSION=40
ARG SOURCE=/go/src/github.com/submariner-io/submariner-operator

FROM --platform=${BUILDPLATFORM} quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH} AS builder
Expand All @@ -9,12 +10,24 @@ COPY . ${SOURCE}

RUN make -C ${SOURCE} LOCAL_BUILD=1 bin/${TARGETPLATFORM}/submariner-operator

FROM --platform=${BUILDPLATFORM} fedora:${FEDORA_VERSION} AS base
ARG FEDORA_VERSION
ARG SOURCE
ARG TARGETPLATFORM

COPY package/dnf_install /

RUN /dnf_install -a ${TARGETPLATFORM} -v ${FEDORA_VERSION} -r /output/submariner-operator \
setup

FROM --platform=${TARGETPLATFORM} scratch
ARG SOURCE
ARG TARGETPLATFORM

ENV USER_UID=1001 PATH=/

COPY --from=base /output/submariner-operator /

# install operator binary
COPY --from=builder ${SOURCE}/bin/${TARGETPLATFORM}/submariner-operator /submariner-operator

Expand Down
62 changes: 62 additions & 0 deletions package/dnf_install
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/bin/bash

# Installs packages using dnf to a named root:
# -a arch - use arch instead of the native arch
# -k - keep the package cache
# -r root - install to the named root instead of /output/base
# -v ver - use the given Fedora version (required)
#
# %arch in the package references will be replaced with the chosen arch

INSTALL_ROOT=/output/base

# Limit the number of files so that dnf doesn't spend ages processing fds
ulimit -n 1048576
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, what I really need to do is move dnf_install to Shipyard and unify it.


while getopts a:kr:v: o
do
case "$o" in
a)
ARCH="$OPTARG"
;;
k)
KEEP_CACHE=true
;;
r)
INSTALL_ROOT="$OPTARG"
;;
v)
FEDORA_VERSION="$OPTARG"
;;
*)
echo "$0 doesn't support $o" >&2
exit 1
;;
esac
done
shift $((OPTIND - 1))

if [[ -n "${ARCH}" ]]; then
# Convert container arch to Fedora arch
ARCH="${ARCH##*/}"
case "${ARCH}" in
amd64) ARCH=x86_64;;
arm64) ARCH=aarch64;;
esac
arch_args="--forcearch ${ARCH}"
else
# This will be used later, but we won't force
ARCH="$(rpm -q --qf "%{arch}" rpm)"
fi

[[ -z "${FEDORA_VERSION}" ]] && echo I need to know which version of Fedora to install, specify it with -v >&2 && exit 1

if [[ "${INSTALL_ROOT}" != /output/base ]] && [[ ! -d "${INSTALL_ROOT}" ]] && [[ -d /output/base ]]; then
cp -a /output/base "${INSTALL_ROOT}"
fi

dnf -y --setopt=install_weak_deps=0 --nodocs ${arch_args} \
--installroot "${INSTALL_ROOT}" --releasever "${FEDORA_VERSION}" \
install "${@//\%arch/${ARCH}}"

[[ "${KEEP_CACHE}" == true ]] || dnf -y ${arch_args} --installroot "${INSTALL_ROOT}" --releasever "${FEDORA_VERSION}" clean all
Loading