Skip to content

Commit

Permalink
build: remove build flags
Browse files Browse the repository at this point in the history
Remove some of the build tags since some of these features are now
needed for local containers, such as `devicemapper` and `overlay`
  • Loading branch information
kingsleyzissou committed Mar 1, 2024
1 parent 07d6a00 commit e1104c5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.fedoraproject.org/fedora:39 AS builder
RUN dnf install -y git-core golang gpgme-devel libassuan-devel && mkdir -p /build/bib
RUN dnf install -y git-core golang gpgme-devel libassuan-devel device-mapper-devel && mkdir -p /build/bib
COPY bib/go.mod bib/go.sum /build/bib
RUN cd /build/bib && go mod download
COPY build.sh /build
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
# Keep this in sync with e.g. https://github.com/containers/podman/blob/2981262215f563461d449b9841741339f4d9a894/Makefile#L51
# It turns off the esoteric containers-storage backends that add dependencies
# on things like btrfs that we don't need.
CONTAINERS_STORAGE_THIN_TAGS="containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay"
CONTAINERS_STORAGE_THIN_TAGS="containers_image_openpgp exclude_graphdriver_btrfs"

cd bib
set -x
Expand Down
2 changes: 1 addition & 1 deletion devel/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN make rpm

FROM registry.fedoraproject.org/fedora:39 AS bib-builder
# replace osbuild/images dependency and build bib
RUN dnf install -y git-core golang gpgme-devel libassuan-devel
RUN dnf install -y git-core golang gpgme-devel libassuan-devel device-mapper-devel
COPY --from=images . /build/images
COPY bib /build/bib
COPY build.sh /build
Expand Down

0 comments on commit e1104c5

Please sign in to comment.