summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Fix Makefile ref libseccomp branch as a commitChris Evich2020-01-09
| | | | | | | | | | | | | | | | | | Commit a824186ac9 mistakenly updated LIBSECCOMP_COMMIT with a branch name instead of a commit reference. This breaks on Ubuntu's git with the `--detach` option, causing it to throw this error: ``` fatal: '--detach' cannot be used with '-b/-B/--orphan' ``` Fix this by using the tag `v2.3.3` which at the time of this commit, is the current HEAD of the release-2.3 branch. Thanks to Ed Santiago <santiago@redhat.com> for helping figure out the error and the fix. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #4758 from rhatdan/validateOpenShift Merge Robot2020-01-08
|\ | | | | Don't show PASS on success for gitvalidate
| * Don't show PASS on success for gitvalidateDaniel J Walsh2020-01-06
| | | | | | | | | | | | Make test logs less verbose so that failures are easier to spot. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | packaging: validate installed rpmsSorin Sbarnea2020-01-07
|/ | | | | | | | | | Previously we builded RPMs that contained an outdated conmon which was not compatible. From now on `make-install` will also call `podman version` and `podman info` in order to perform a minimal sanity check of the installation. Fixes: #4665 Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* Bump gitvalidation epochMatthew Heon2020-01-06
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #4762 from NevilleC/nc-issue4367OpenShift Merge Robot2020-01-06
|\ | | | | Generate binaries only if there are changes in src code.
| * Generate binaries only if they are changes in src code.Neville Cain2020-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes I am making: 1. The target `.gopathok` was listed in `.PHONY` which looks wrong as it regenerates `.gopathok` every time we re-run it, which was a part of the issue. I removed it to avoid that. If `.gopathok` is present', makefile should not need to rerun it. 2. Ensure the binaries are created only if they don't exist by adding `bin/podman` and `bin/podman-remote`. 3. Add a `SOURCES = $(shell find . -name "*.go")` and put it as a dependency of the podman binaries target. It allows us to re-generate the binaries only when there is a change in the source files. The downside is it increases the running time of the command that generates them (20 seconds on my virtual machine running Centos 7). If this is a problem, we could introduce a hidden file that would list all the files to track, that would need to be updated only when a dev is introducing new files. 4. Fixed the make package-install as it does not work with yum. I updated the build_rpm.sh to ensure it works on centos 7 and centos 8 with no pre-required installation. Closes #4367 Signed-off-by: Neville Cain <neville.cain@qonto.eu>
* | Bump gitvalidation epochMatthew Heon2020-01-02
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Ensure 'make uninstall' remove bin and conf files.Neville Cain2019-12-28
| | | | | | | | | | | | I updated the 'make uninstall' command to remove: 1. podman and remote bin 2. cni/net.d/87-podman-bridge.conflist 3. podman.conf 4. systemd conf files: io.podman.socket.* Closes #4572 Signed-off-by: Neville Cain <neville.cain@qonto.eu>
* Merge pull request #4714 from openSUSE/testflagsOpenShift Merge Robot2019-12-16
|\ | | | | Allow the injection of TESTFLAGS
| * Allow the injection of TESTFLAGSSascha Grunert2019-12-16
| | | | | | | | | | | | | | This allows to specify the tests to be run, for example when setting `--focus='my-test-regex'`. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | Use systemd/sd-daemon.h headers for systemd presenceChandan Kumar (raukadah)2019-12-16
|/ | | | | | | | | | | | | | | Finding systemd devel packages using libsystemd does not work as in RHEL based distro the package name is systemd-devel and for deb/ubunutu it is libsystemd. It is also giving false result when podman rpm is built with systemd but hack/systemd_tag.sh does not return anything. Install systemd-devel package in build_rpm.sh script Moving to systemd/sd-daemon.h header files which comes from devel packages fixes the issue. Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
* Merge pull request #4690 from Foxboron/morten/fix-ldflagsOpenShift Merge Robot2019-12-13
|\ | | | | [Makefile] `LDFLAGS` is reserved for the GCC linker
| * [Makefile] `LDFLAGS` is reserved for the GCC linkerMorten Linderud2019-12-12
| | | | | | | | | | | | | | | | | | | | | | The env variable `LDFLAGS` belongs to the gcc linker, while the Makefile currently expects these to be valid go compiler flags. Move them to `-extldflags` as appropriate. The equivalent flag in go is `CGO_LDFLAGS`. Ensure test files are also using `LDFLAGS_PODMAN` instead of `LDFLAGS`. Signed-off-by: Morten Linderud <morten@linderud.pw>
* | Bump gitvalidation epochMatthew Heon2019-12-11
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #4601 from ssbarnea/fix/test-build-rpm-changesOpenShift Merge Robot2019-12-05
|\ \ | | | | | | Enable multi-platform rpm building
| * | Enable multi-platform rpm buildingSorin Sbarnea2019-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make: fix python detection for multiple interpreters - make: create generic `package` and `package-install` targets - build_rpm.sh: move package installation into package-install - build_rpm.sh: fix dnf/yum detection - build_rpm.sh: install md2man rpm only on platfroms where is available - build_rpm.sh: temporary skip packaging docs and debug on rhel-8 - docs: `make package-install` This change is validated by new CI jobs run by rdoproject. See link below for result. Depends-On: https://review.rdoproject.org/r/#/c/23943/ Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | | Avoid git warnings by using detach on checkoutSorin Sbarnea2019-12-04
|/ / | | | | | | | | | | | | | | | | Git displays a huge and confusing warning when doing a checkout of a specific commit if the --detach option is not mentioned. This cleans up our build logs, making it easier to spot real problems. Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | Attempt to install go-md2man only if missingSorin Sbarnea2019-12-03
| | | | | | | | | | Fixes: #4632 Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | build: improved main makefileSorin Sbarnea2019-12-02
| | | | | | | | | | | | | | | | * added .install.md2man as dependency for docs, fixed broken build on systems that do not have go-md2man preinstalled. * sorted PHONY targets Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | Detect Python executable in MakefileSorin Sbarnea2019-11-27
| | | | | | | | | | | | | | `make help` failed on modern platforms that have only python3 executable installed. Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | create a separate install target for seccompLokesh Mandvekar2019-11-10
| | | | | | | | | | | | | | | | | | | | podman in Fedora gets seccomp.json from containers-common while the one in Ubuntu PPA gets seccomp.json from containers-golang. This change will let me use install.config target unmodified in downstream packages. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Add support for make vendor-in-containerDaniel J Walsh2019-11-08
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Makefile: add vendor-in-containerGiuseppe Scrivano2019-11-06
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | [Makefile] Fix docker documentation install and generationMorten Linderud2019-11-02
|/ | | | | | | | | | The final versions of the documentation has been shifted from `docs/` to `docs/build/man`. Most of the Makefile has been changed accordingly, but the docker documentation generation was not. Introduced by #4354 Signed-off-by: Morten Linderud <morten@linderud.pw>
* Merge pull request #4354 from baude/newdocsstructOpenShift Merge Robot2019-10-31
|\ | | | | Restructure documentation dir
| * Update document formatting and packaging codeJhon Honce2019-10-31
| | | | | | | | | | | | | | | | | | * Refactored code and Makefile to support new docs layout * Removed some old code packaging code * Add Readme.md to document what we're doing Signed-off-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: baude <bbaude@redhat.com>
| * Restructure documentation dirbaude2019-10-31
| | | | | | | | | | | | | | | | Restructuring the docs dir to make integration with sphinx easier. man pages now exist in docs/source/man and the sphinx make files exists in docs. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #4352 from vrothberg/config-packageOpenShift Merge Robot2019-10-31
|\ \ | |/ |/| refactor libpod config into libpod/config
| * add libpod/configValentin Rothberg2019-10-31
| | | | | | | | | | | | | | | | | | | | | | | | Refactor the `RuntimeConfig` along with related code from libpod into libpod/config. Note that this is a first step of consolidating code into more coherent packages to make the code more maintainable and less prone to regressions on the long runs. Some libpod definitions were moved to `libpod/define` to resolve circular dependencies. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | build: drop support for ostreeGiuseppe Scrivano2019-10-30
|/ | | | | | | it is going to be removed from containers/image as well, so no longer depend on it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Makefile: fix embedding gitCommitAkihiro Suda2019-10-29
| | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* Initial checking for readthedocsbaude2019-10-22
| | | | Signed-off-by: baude <bbaude@redhat.com>
* Bump gitvalidation epochMatthew Heon2019-10-17
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Bump gitvalidation epochMatthew Heon2019-10-16
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Make user io.podman.service unit WantedBy=default.targetColin Walters2019-10-11
| | | | | | | | | | | | | | | `multi-user.target` doesn't exist in the systemd *user* instance. We can't hook up the startup of a user unit to a system target. Doing so causes systemd to error out in Fedora CoreOS builds during presets. Make it depend on `default.target` instead. (Having the same unit in both system and user sessions has some tricky bits like this) Signed-off-by: Colin Walters <walters@verbum.org>
* Cirrus: Produce and collect varlink outputChris Evich2019-10-08
| | | | | | | | | | | | | When executing 'make remotesystem' testing, a varlink process is started up but it's stdio is dumped due to the production of excessive data. However, this also means if the process has a problem, any errors will not be accessible. Instead, grab only the last 100 lines and direct them into a file. Also update automation's log collection to retrieve this file when the `$REMOTE_CLIENT` env. var. is `true`. Signed-off-by: Chris Evich <cevich@redhat.com>
* Bump gitvalidation epochMatthew Heon2019-10-02
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Bump gitvalidation epochMatthew Heon2019-10-02
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Bump gitvalidation epochMatthew Heon2019-09-30
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Add a missing escape in the MakefileNalin Dahyabhai2019-09-26
| | | | Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* Merge pull request #4104 from mheon/bump-1.6.0-rc2OpenShift Merge Robot2019-09-25
|\ | | | | Bump to 1.6.0-rc2
| * Bump gitvalidation epochMatthew Heon2019-09-24
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Cirrus: Fail early on CI script unit testChris Evich2019-09-23
|/ | | | | | | Instead of running this basic checks for almost all tasks, just do them once at the beginning. Signed-off-by: Chris Evich <cevich@redhat.com>
* Support podman-remote help on windowsJhon Honce2019-09-19
| | | | | | | | * Update scipts to produce darwin and windows output * Update batch file to re-direct help requests to browser * Add pandoc filter for markdown to html links Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Bump Gitvalidation epochMatthew Heon2019-09-16
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Add podman icon to installerJhon Honce2019-09-12
| | | | | | Update Makefile per review comments Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Support building Windows msi fileJhon Honce2019-09-11
| | | | | | | | | | * Update Makefile to build msi * Add podman.wxs to define podman.msi * Version information provided by Makefile * Add podman.bat wrapper for podman-remote-windows.exe to ensure environment * Add wix xml schemas for reference Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Merge pull request #3973 from baude/validateupdateOpenShift Merge Robot2019-09-11
|\ | | | | add lint and manpage check to make validate
| * add lint and manpage check to make validatebaude2019-09-10
| | | | | | | | | | | | | | make validate now runs golangci-lint and the man-page-checker to ensure a PR is ready for our CI system. Signed-off-by: baude <bbaude@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 23:45:44 +0000