Skip to content

Commit

Permalink
podman 4.4.0
Browse files Browse the repository at this point in the history
* podman 4.4.0
  - Build with the latest go
  - Use GNU Make to fix "invalid `override' directive" error
  - Build from git tag to fix "fatal: not a git repository" error
  - Fix build doc error by using just one job with `-j1` argument
* Add resource netavark's build dependency protobuf
* Add quadlet path to test
* Add remove make `-j1` flag at next release comment
* Move `make` build dependency to `on_macos` block

Closes #122296.

Signed-off-by: Dawid Dziurla <[email protected]>
Signed-off-by: Michka Popoff <[email protected]>
Signed-off-by: BrewTestBot <[email protected]>
  • Loading branch information
xxyzz authored and BrewTestBot committed Feb 5, 2023
1 parent 1aa5ba2 commit 4f87902
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions Formula/podman.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
class Podman < Formula
desc "Tool for managing OCI containers and pods"
homepage "https://podman.io/"
url "https://github.com/containers/podman/archive/v4.3.1.tar.gz"
sha256 "455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813"
url "https://github.com/containers/podman.git",
tag: "v4.4.0",
revision: "3443f453e28169a88848f90a7ce3137fc4a4bebf"
license all_of: ["Apache-2.0", "GPL-3.0-or-later"]
head "https://github.com/containers/podman.git", branch: "main"

Expand All @@ -17,19 +18,19 @@ class Podman < Formula
sha256 x86_64_linux: "4b4d3245f41cc8ad7f6352f1ccd8db1ad5a12910572ef47a6a1ec1d053aec5dd"
end

depends_on "go" => :build
depends_on "go-md2man" => :build
# Required latest gvisor.dev/gvisor/pkg/gohacks
# Try to switch to the latest go on the next release
depends_on "[email protected]" => :build

on_macos do
depends_on "make" => :build
depends_on "qemu"
end

on_linux do
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "pkg-config" => :build
depends_on "protobuf" => :build
depends_on "rust" => :build
depends_on "conmon"
depends_on "crun"
Expand All @@ -42,8 +43,8 @@ class Podman < Formula

resource "gvproxy" do
on_macos do
url "https://github.com/containers/gvisor-tap-vsock/archive/v0.4.0.tar.gz"
sha256 "896cf02fbabce9583a1bba21e2b384015c0104d634a73a16d2f44552cf84d972"
url "https://github.com/containers/gvisor-tap-vsock/archive/v0.5.0.tar.gz"
sha256 "8048f4f5faa2722547d1854110c2347f817b2f47ec51d39b2a7b308f52a7fe59"
end
end

Expand All @@ -62,21 +63,22 @@ class Podman < Formula

resource "netavark" do
on_linux do
url "https://github.com/containers/netavark/archive/refs/tags/v1.3.0.tar.gz"
sha256 "cc8a8e03498cb9b4c74fdbda09a64fdf9000fea398d07073c4e368fc83d35f56"
url "https://github.com/containers/netavark/archive/refs/tags/v1.5.0.tar.gz"
sha256 "303fbcf3fc645b0e8e8fc1759626c92082f85f49b9d07672918aebd496a24d34"
end
end

resource "aardvark-dns" do
on_linux do
url "https://github.com/containers/aardvark-dns/archive/refs/tags/v1.3.0.tar.gz"
sha256 "6dd1ce4346ed5c57bbd990140e02e69c036919032582b937d2ad7835329d3bc3"
url "https://github.com/containers/aardvark-dns/archive/refs/tags/v1.5.0.tar.gz"
sha256 "b7e7ca1b94c1a62c8800f49befb803ec37cc5caf7656352537343a8fb654e4a6"
end
end

def install
if OS.mac?
ENV["CGO_ENABLED"] = "1"
ENV.prepend_path "PATH", Formula["make"].opt_libexec/"gnubin"

system "make", "podman-remote"
bin.install "bin/darwin/podman" => "podman-remote"
Expand All @@ -90,7 +92,8 @@ def install
(libexec/"podman").install "bin/gvproxy"
end

system "make", "podman-remote-darwin-docs"
# Remove the "-j1" flag at next release
system "make", "-j1", "podman-remote-darwin-docs"
man1.install Dir["docs/build/remote/darwin/*.1"]

bash_completion.install "completions/bash/podman"
Expand Down Expand Up @@ -173,6 +176,7 @@ def caveats
#{libexec}/podman/catatonit
#{libexec}/podman/netavark
#{libexec}/podman/aardvark-dns
#{libexec}/podman/quadlet
#{libexec}/podman/rootlessport
].sort, Dir[libexec/"podman/*"].sort
out = shell_output("file #{libexec}/podman/catatonit")
Expand Down

0 comments on commit 4f87902

Please sign in to comment.