Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ RUN set -ex; \
mkdir -p /usr/local/lib/podman; \
mv bin/rootlessport /usr/local/lib/podman/rootlessport; \
! ldd /usr/local/lib/podman/rootlessport
# copying completions to /comp instead of /usr/local/share to avoid copying potentially other unwanted stuff in the final stage
RUN set -eux; \
install -Dm644 -t /comp/bash-completion/completions/ completions/bash/podman; \
install -Dm644 -t /comp/zsh/site-functions/ completions/zsh/_podman; \
install -Dm644 -t /comp/fish/vendor_completions.d/ completions/fish/podman.fish


# conmon (without systemd support)
Expand Down Expand Up @@ -164,6 +169,7 @@ RUN apk add --no-cache tzdata ca-certificates
COPY --from=conmon /conmon/bin/conmon /usr/local/lib/podman/conmon
COPY --from=podman /usr/local/lib/podman/rootlessport /usr/local/lib/podman/rootlessport
COPY --from=podman /usr/local/bin/podman /usr/local/bin/podman
COPY --from=podman /comp /usr/local/share
COPY --from=passt /passt/bin/ /usr/local/bin/
COPY --from=netavark /netavark/target/release/netavark /usr/local/lib/podman/netavark
COPY conf/containers /etc/containers
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile-remote
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ RUN set -eux; \
ln -s podman-remote /usr/local/bin/docker; \
podman --help >/dev/null; \
[ "$(ldd /usr/local/bin/podman-remote | wc -l)" -eq 0 ] || (ldd /usr/local/bin/podman-remote; false)
# copying completions to /comp instead of /usr/local/share to avoid copying potentially other unwanted stuff in the final stage
RUN set -eux; \
install -Dm644 -t /comp/bash-completion/completions/ completions/bash/podman-remote; \
install -Dm644 -t /comp/zsh/site-functions/ completions/zsh/_podman-remote; \
install -Dm644 -t /comp/fish/vendor_completions.d/ completions/fish/podman-remote.fish

FROM alpine:3.22
COPY --from=podman-remote /usr/local/bin /usr/local/bin
COPY --from=podman-remote /comp /usr/local/share
RUN adduser -D podman-remote -h /podman -u 1000
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,10 @@ tar: .podman-from-container
.podman-from-container: IMAGE_ROOTFS = $(BUILD_DIR)/images/podman/linux_$(ARCH)
.podman-from-container: podman-tar-image
rm -rf $(ASSET_DIR)
mkdir -p $(ASSET_DIR)/etc $(ASSET_DIR)/usr/local/lib/systemd/{system,user}-generators
mkdir -p $(ASSET_DIR)/etc $(ASSET_DIR)/usr/local/lib/systemd/{system,user}-generators $(ASSET_DIR)/usr/local/share
cp -rt $(ASSET_DIR)/etc $(IMAGE_ROOTFS)/etc/containers
cp -rt $(ASSET_DIR)/usr/local $(IMAGE_ROOTFS)/usr/local/{bin,lib,libexec}
cp -rt $(ASSET_DIR)/usr/local/share $(IMAGE_ROOTFS)/usr/local/share/{bash-completion,zsh,fish}
ln -s ../../../libexec/podman/quadlet $(ASSET_DIR)/usr/local/lib/systemd/user-generators/podman-user-generator
ln -s ../../../libexec/podman/quadlet $(ASSET_DIR)/usr/local/lib/systemd/system-generators/podman-system-generator
cp README.md $(ASSET_DIR)/
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ Before uninstalling the binaries, you may remove containers, pods, images, volum
sudo podman system reset
```

Next, remove all the copied binaries from the following folders:
Next, remove all the copied binaries and support files from the following folders:

```sh
sudo rm -rf /etc/containers/*
sudo rm -rf /usr/local/bin/{crun,fuse-overlayfs,fusermount3,pasta,pasta.avx2,podman,runc}
sudo rm -rf /usr/local/{lib,libexec}/podman
sudo rm -rf /usr/local/lib/systemd/{system,user}/podman*
sudo rm /usr/local/lib/systemd/{system,user}-generators/podman-*-generator
sudo rm /usr/local/share/{bash-completion/completions/podman,zsh/site-functions/_podman,fish/vendor_completions.d/podman.fish}
```
Loading