Merge remote-tracking branch 'origin/main' into feature/26588-exec-no-session

Author: ryanmccann1024

.cirrus.yml

@@ -122,10 +122,10 @@ validate-source_task:
     setup_script: &setup '$GOSRC/$SCRIPT_BASE/setup_environment.sh'
     golangci-lint_cache:
         folder: /root/.cache/golangci-lint
-        reupload_on_changes: true
-        fingerprint_script:
+        fingerprint_script: &golangci_cache_fingerprint
             - go version
             - grep GOLANGCI_LINT_VERSION Makefile | head -1
+            - date +%U
     # Standard main execution stage call, used by nearly every task in CI.
     main_script: &main '/usr/bin/time --verbose --output="$STATS_LOGFILE" $GOSRC/$SCRIPT_BASE/runner.sh'
 
@@ -331,7 +331,7 @@ freebsd_alt_build_task:
         TEST_FLAVOR: "altbuild"
         ALT_NAME: 'FreeBSD Cross'
     freebsd_instance:
-        image_family: freebsd-13-4
+        image_family: freebsd-14-3
         # golangci-lint is a very, very hungry beast.
         cpu: 4
         memory: 8Gb
@@ -340,10 +340,7 @@ freebsd_alt_build_task:
         - go version # Downloads a new go version based on go.mod's go directive.
     golint_cache:
         folder: ~/.cache/golangci-lint
-        reupload_on_changes: true
-        fingerprint_script:
-            - go version
-            - grep GOLANGCI_LINT_VERSION Makefile | head -1
+        fingerprint_script: *golangci_cache_fingerprint
     lint_script:
         - gmake golangci-lint
     build_amd64_script:

.github/workflows/first_contrib_cert_generator.yml

@@ -3,7 +3,7 @@ name: Generate Contributor Certificate Preview
 # This action triggers automatically when a pull request is closed,
 # or can be run manually from the Actions tab.
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
     branches:
       - main
@@ -34,7 +34,7 @@ jobs:
       - name: Check for first merged PR
         id: check_first_pr
         if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const author = context.payload.pull_request.user.login;
@@ -77,7 +77,7 @@ jobs:
       # Step 4: Setup Node.js environment
       - name: Setup Node.js
         if: ${{ github.event_name == 'workflow_dispatch' || steps.check_first_pr.outputs.is_first_pr == 'true' }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: latest
 
@@ -118,7 +118,7 @@ jobs:
       # Step 7: Upload certificate image to separate repository
       - name: Upload certificate to separate repository
         if: ${{ github.event_name == 'workflow_dispatch' || steps.check_first_pr.outputs.is_first_pr == 'true' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.CERTIFICATES_REPO_TOKEN }}
           script: |
@@ -217,7 +217,7 @@ jobs:
       # Step 8: Comment on Pull Request with embedded image
       - name: Comment with embedded certificate image
         if: ${{ github.event_name == 'workflow_dispatch' || steps.check_first_pr.outputs.is_first_pr == 'true' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             try {

.golangci.yml

@@ -64,7 +64,6 @@ linters:
     revive:
       rules:
         - name: unused-parameter
-          disabled: true
   exclusions:
     generated: strict
     presets:

Makefile

@@ -70,7 +70,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
 # N/B: This value is managed by Renovate, manual changes are
 # possible, as long as they don't disturb the formatting
 # (i.e. DO NOT ADD A 'v' prefix!)
-GOLANGCI_LINT_VERSION := 2.4.0
+GOLANGCI_LINT_VERSION := 2.5.0
 PYTHON ?= $(shell command -v python3 python|head -n1)
 PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
 # ~/.local/bin is not in PATH on all systems
@@ -150,12 +150,17 @@ GINKGO ?= ./bin/ginkgo
 GINKGO_FLAKE_ATTEMPTS ?= 0
 GINKGO_NO_COLOR ?= y
 
+# The type of transport to use for testing remote service.
+# Must be one of unix, tcp, tls, mtls
+export REMOTESYSTEM_TRANSPORT ?= unix
+export REMOTEINTEGRATION_TRANSPORT ?= unix
+
 # Conditional required to produce empty-output if binary not built yet.
 RELEASE_VERSION = $(shell if test -x test/version/version; then test/version/version; fi)
 RELEASE_NUMBER = $(shell echo "$(call err_if_empty,RELEASE_VERSION)" | sed -e 's/^v\(.*\)/\1/')
 
-# If non-empty, logs all output from server during remote system testing
-PODMAN_SERVER_LOG ?=
+# Logs all output from server during remote system testing to this file
+PODMAN_SERVER_LOG ?= /dev/null
 
 # Ensure GOBIN is not set so the default (`go env GOPATH`/bin) is used.
 override undefine GOBIN
@@ -680,6 +685,7 @@ ginkgo-run: .install.ginkgo
 ginkgo:
 	$(MAKE) ginkgo-run TAGS="$(BUILDTAGS)"
 
+
 .PHONY: ginkgo-remote
 ginkgo-remote:
 	$(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing"
@@ -709,44 +715,15 @@ localsystem:
 	PODMAN=$(CURDIR)/bin/podman QUADLET=$(CURDIR)/bin/quadlet bats -T --filter-tags '!ci:parallel' test/system/
 	PODMAN=$(CURDIR)/bin/podman QUADLET=$(CURDIR)/bin/quadlet bats -T --filter-tags ci:parallel -j $$(nproc) test/system/
 
+
 .PHONY: remotesystem
 remotesystem:
 	# Wipe existing config, database, and cache: start with clean slate.
 	$(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers
-	# . Make sure there's no active podman server - if there is,
-	#   it's not us, and we have no way to know what it is.
-	# . Start server. Wait to make sure it comes up.
-	# . Run tests, pretty much the same as localsystem.
-	# . Stop server.
-	rc=0;\
-	if timeout -v 1 true; then \
-		if ./bin/podman-remote info; then \
-			echo "Error: podman system service (not ours) is already running" >&2;\
-			exit 1;\
-		fi;\
-		./bin/podman system service --timeout=0 > $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) 2>&1 & \
-		retry=5;\
-		while [ $$retry -ge 0 ]; do\
-			echo Waiting for server...;\
-			sleep 1;\
-			./bin/podman-remote info >/dev/null 2>&1 && break;\
-			retry=$$(expr $$retry - 1);\
-		done;\
-		if [ $$retry -lt 0 ]; then\
-			echo "Error: ./bin/podman system service did not come up" >&2;\
-			exit 1;\
-		fi;\
-		env PODMAN="$(CURDIR)/bin/podman-remote" bats -T --filter-tags '!ci:parallel' test/system/ ;\
-		rc=$$?; \
-		if [ $$rc -eq 0 ]; then \
-		   env PODMAN="$(CURDIR)/bin/podman-remote" bats -T --filter-tags ci:parallel -j $$(nproc) test/system/ ;\
-		   rc=$$?;\
-		fi; \
-		kill %1;\
-	else \
-		echo "Skipping $@: 'timeout -v' unavailable'";\
-	fi;\
-	exit $$rc
+	PODMAN=$(CURDIR)/bin/podman-remote QUADLET=$(CURDIR)/bin/quadlet \
+		bats -T --filter-tags '!ci:parallel' test/system/
+	PODMAN=$(CURDIR)/bin/podman-remote QUADLET=$(CURDIR)/bin/quadlet \
+		bats -T --filter-tags ci:parallel -j $$(nproc) test/system/
 
 .PHONY: localapiv2-bash
 localapiv2-bash:

README.md

@@ -3,7 +3,7 @@
 # Podman: A tool for managing OCI containers and pods
 ![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)
 ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containers/podman)
-[![Go Report Card](https://goreportcard.com/badge/github.com/containers/libpod)](https://goreportcard.com/report/github.com/containers/libpod)
+[![Go Report Card](https://goreportcard.com/badge/github.com/containers/podman/v5)](https://goreportcard.com/report/github.com/containers/podman/v5)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10499/badge)](https://www.bestpractices.dev/projects/10499)
 
 [![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=containers-podman)](https://insights.linuxfoundation.org/project/containers-podman)

cmd/podman-mac-helper/install.go

@@ -83,7 +83,7 @@ func init() {
 	rootCmd.AddCommand(installCmd)
 }
 
-func install(cmd *cobra.Command, args []string) error {
+func install(_ *cobra.Command, _ []string) error {
 	userName, uid, homeDir, err := getUser()
 	if err != nil {
 		return err

cmd/podman-mac-helper/main.go

@@ -142,7 +142,7 @@ func addPrefixFlag(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&installPrefix, "prefix", defaultPrefix, "Sets the install location prefix")
 }
 
-func silentUsage(cmd *cobra.Command, args []string) {
+func silentUsage(cmd *cobra.Command, _ []string) {
 	cmd.SilenceUsage = true
 	cmd.SilenceErrors = true
 }

cmd/podman-mac-helper/service.go

@@ -31,7 +31,7 @@ func init() {
 	rootCmd.AddCommand(serviceCmd)
 }
 
-func serviceRun(cmd *cobra.Command, args []string) {
+func serviceRun(_ *cobra.Command, _ []string) {
 	info, err := os.Stdin.Stat()
 	if err != nil || info.Mode()&fs.ModeSocket == 0 {
 		fmt.Fprintln(os.Stderr, "This is an internal command that is not intended for standard terminal usage")

cmd/podman-mac-helper/uninstall.go

@@ -27,7 +27,7 @@ func init() {
 	rootCmd.AddCommand(uninstallCmd)
 }
 
-func uninstall(cmd *cobra.Command, args []string) error {
+func uninstall(_ *cobra.Command, _ []string) error {
 	userName, _, homeDir, err := getUser()
 	if err != nil {
 		return err

cmd/podman-testing/create.go

@@ -88,7 +88,7 @@ func init() {
 	flags.StringVarP(&createContainerOpts.Layer, "layer", "l", "", "ID of containers's read-write layer (default none)")
 }
 
-func createStorageLayer(cmd *cobra.Command, args []string) error {
+func createStorageLayer(_ *cobra.Command, _ []string) error {
 	results, err := testingEngine.CreateStorageLayer(mainContext, createStorageLayerOpts)
 	if err != nil {
 		return err
@@ -98,7 +98,7 @@ func createStorageLayer(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func createLayer(cmd *cobra.Command, args []string) error {
+func createLayer(_ *cobra.Command, _ []string) error {
 	results, err := testingEngine.CreateLayer(mainContext, createLayerOpts)
 	if err != nil {
 		return err
@@ -108,7 +108,7 @@ func createLayer(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func createImage(cmd *cobra.Command, args []string) error {
+func createImage(_ *cobra.Command, _ []string) error {
 	results, err := testingEngine.CreateImage(mainContext, createImageOpts)
 	if err != nil {
 		return err
@@ -118,7 +118,7 @@ func createImage(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func createContainer(cmd *cobra.Command, args []string) error {
+func createContainer(_ *cobra.Command, _ []string) error {
 	results, err := testingEngine.CreateContainer(mainContext, createContainerOpts)
 	if err != nil {
 		return err