Merge pull request #5022 from ssbarnea/fix/validate

Assure validate includes lint

4 files changed, 9 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index f90124435..f71f7d2b1 100644
--- a/Makefile
+++ b/Makefile
@@ -591,7 +591,7 @@ validate.completions: completions/bash/podman
 	if [ -x /bin/zsh ]; then /bin/zsh completions/zsh/_podman; fi
 
 .PHONY: validate
-validate: gofmt .gitvalidation validate.completions golangci-lint man-page-check
+validate: lint gofmt .gitvalidation validate.completions man-page-check
 
 .PHONY: build-all-new-commits
 build-all-new-commits:
diff --git a/contrib/systemd/README.md b/contrib/systemd/README.md
index 20f11467a..ff266c6a5 100644
--- a/contrib/systemd/README.md
+++ b/contrib/systemd/README.md
@@ -5,15 +5,15 @@
 The following unit file examples assume:
  1. copied the `service` executable into `/usr/local/bin`
  1. `chcon system_u:object_r:container_runtime_exec_t:s0 /usr/local/bin/service`
- 
+
 then:
  1. copy the `podman.service` and `podman.socket` files into `/etc/systemd/system`
  1. `systemctl daemon-reload`
  1. `systemctl enable podman.socket`
  1. `systemctl start podman.socket`
  1. `systemctl status podman.socket podman.service`
- 
-Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock` 
+
+Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock`
 
 ### podman.service
 ```toml
@@ -55,15 +55,15 @@ The following unit file examples assume:
  1. you have a created a directory `~/bin`
  1. copied the `service` executable into `~/bin`
  1. `chcon system_u:object_r:container_runtime_exec_t:s0 ~/bin/service`
- 
+
 then:
  1. `mkdir -p ~/.config/systemd/user`
  1. copy the `podman.service` and `podman.socket` files into `~/.config/systemd/user`
  1. `systemctl --user enable podman.socket`
  1. `systemctl --user start podman.socket`
  1. `systemctl --user status podman.socket podman.service`
- 
-Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock` 
+
+Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock`
 
 ### podman.service
 
diff --git a/install.md b/install.md
index cd77ad139..b143c7f7a 100644
--- a/install.md
+++ b/install.md
@@ -90,7 +90,7 @@ Built-in, no need to install
 #### [Raspbian](https://raspbian.org)
 
 The Kubic project provides packages for Raspbian 10.
- 
+
 ```bash
 # Raspbian 10
 echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
@@ -184,7 +184,7 @@ with our [COPR repository](https://copr.fedorainfracloud.org/coprs/baude/Upstrea
 #### [Raspbian](https://raspbian.org)
 
 The Kubic project provides RC/testing packages for Raspbian 10.
- 
+
 ```bash
 # Raspbian 10
 echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/Raspbian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list
diff --git a/pkg/api/Makefile b/pkg/api/Makefile
index f564b6516..c68e50011 100644
--- a/pkg/api/Makefile
+++ b/pkg/api/Makefile
@@ -10,4 +10,3 @@ ${SWAGGER_OUT}:
 	# generate doesn't remove file on error
 	rm -f ${SWAGGER_OUT}
 	swagger generate spec -o ${SWAGGER_OUT} -i tags.yaml -w ./
-