Skip to content

Commit

Permalink
no more podman dep
Browse files Browse the repository at this point in the history
  • Loading branch information
dleviminzi committed Dec 11, 2024
1 parent 19a9c9c commit b43b086
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions docker/Dockerfile.worker
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,12 @@ make binaries
EOT


# Add a buildah build stage
# buildah build stage
FROM golang AS buildah

WORKDIR /workspace
RUN apt-get update && apt-get install -y \
make \
bats \
btrfs-progs \
git \
go-md2man \
Expand All @@ -78,7 +77,7 @@ RUN apt-get update && apt-get install -y \
pkg-config

RUN git clone https://github.com/containers/buildah.git . && \
CGO_ENABLED=0 make BUILDTAGS="containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp cni" && \
make BUILDTAGS="cni" && \
make install

# beta9 worker
Expand Down Expand Up @@ -116,7 +115,10 @@ RUN apt-get install -y --no-install-recommends nvidia-container-toolkit-base nvi

RUN apt-get update && apt-get install -y fuse3 libfuse2 libfuse3-dev libfuse-dev bash-completion

RUN apt-get install -y libbtrfs-dev libgpgme11-dev podman
RUN apt-get install -y libbtrfs-dev libgpgme11-dev
RUN mkdir -p /etc/containers/registries.conf.d
RUN curl -L https://raw.githubusercontent.com/containers/shortnames/refs/heads/main/shortnames.conf \
-o /etc/containers/registries.conf.d/shortnames.conf

# XXX: Remove once cedana starts shipping with a compatible binary
RUN <<EOT
Expand Down Expand Up @@ -187,3 +189,6 @@ COPY --from=buildah /usr/local/bin/buildah /usr/local/bin/buildah

VOLUME "/usr/lib/x86_64-linux-gnu"
VOLUME "/usr/lib/aarch64-linux-gnu"

ENV _BUILDAH_STARTED_IN_USERNS="" \
BUILDAH_ISOLATION=chroot

0 comments on commit b43b086

Please sign in to comment.