Commit Graph

23 Commits

Author SHA1 Message Date
Bruce Ashfield
5f8055f484 conmon: update to 2.1.12-tip
Bumping conmon to version v2.1.3-168-gaee638f, which comprises the following commits:

    02c6ea6 Avoid bogus journal filling errors

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2025-01-17 19:17:09 +00:00
Bruce Ashfield
e977aba247 conmon: update to 2.1.12
Bumping conmon to version v2.1.3-147-ga500cbd, which comprises the following commits:

    a500cbd logging: remove unuseful fsync
    1578849 fix(deps): update module golang.org/x/sys to v0.20.0
    c7a88f8 Remove CI VM OS names
    be3e546 chore(deps): update dependency containers/automation_images to v20240513
    e889663 Bump version to 2.1.12
    ff8794c Make 'docs' target not depend on 'install.tools' if GOMD2MAN is set
    10f7826 Packit: enable downstream sync to CentOS Stream 10
    e21e7c8 Build s390x binaries using musl libc
    9ce7b1a Add support for s390x

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2024-07-11 14:07:17 +00:00
Bruce Ashfield
7a5bf9f670 conmon: update to 2.1.10
Bumping conmon to version v2.1.3-138-gaffab49, which comprises the following commits:

    9ce7b1a Add support for s390x
    3e103d6 Remove checks for (long)deprecated libsystemd-journal in favor of libsystemd
    f2be46f update packit config, enable downstream tasks
    59c6de4 fix(deps): update module github.com/onsi/gomega to v1.31.1
    1e0d24b [skip-ci] Update actions/setup-go action to v5
    bc27f79 [skip-ci] Update actions/cache action to v4
    386bb80 fix(deps): update github.com/opencontainers/runtime-tools digest to 408c51e
    14a34a8 chore(deps): update dependency containers/automation_images to v20240102
    8c6e47f drop --tty on exec
    3e425d1 chore(deps): update dependency containers/automation_images to v20231208
    90432cc docs/Makefile: softcode GOMD2MAN
    2dcd736 bump to 2.1.10
    5fec3c0 fix(deps): update module github.com/onsi/gomega to v1.30.0
    8babb44 chore(deps): update module github.com/docker/docker to v24 [security]
    2bc8747 chore(deps): update module golang.org/x/net to v0.17.0 [security]
    8557c11 Fix incorrect free in conn_sock
    116675e logging: Respect log-size-max immediately after open
    fad6bac fix some issues flagged by SAST scan
    91092aa version: bump to 2.1.9
    521f585 README.md: update the correct Nix channel
    26053bd Fix podman tests
    20ce441 Forward more messages on the sd-notify socket
    57eedf0 ci: skip broken cri-o tests
    03b64fa logging: -l passthrough accepts TTYs
    3605a36 src: fix write after end of buffer
    f269c2f src: open all files with O_CLOEXEC
    633ac6b oom-score: restore oom score before running exit command
    f0eb924 src/seccomp_notify.c: fix static build
    a58206d CI: Update Fedora names
    f5eeb6a chore(deps): update dependency containers/automation_images to v20231004
    6d88cb3 fix(deps): update module github.com/onsi/ginkgo/v2 to v2.12.0

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2024-03-15 17:17:19 +00:00
Bruce Ashfield
dae8061c08 conmon: update to 2.1.8
Bumping conmon to version v2.1.3-87-g6d88cb3, which comprises the following commits:

    6d88cb3 fix(deps): update module github.com/onsi/ginkgo/v2 to v2.12.0
    00e08f4 bump to v2.1.8
    57d5e7f fix(deps): update module github.com/containers/storage to v1.48.0
    adc748c cli: log parsing errors to stderr
    b0bdc23 Update nix and use an overlay
    04cf7ba chore(deps): update dependency containers/automation_images to v20230809
    ccdae54 gh actions: bump to go 1.21
    4e61870 gh actions: drop perma-failing jobs
    730d92c fix(deps): update module github.com/onsi/ginkgo/v2 to v2.11.0
    73ab92e Changes to build conmon for `riscv64`
    53b3691 stdio: ignore EIO for terminals
    77ce312 refactor: handle a broken pipe with write_sync_fd
    fa67ce6 ensure console socket buffers are properly sized

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-09-15 17:30:39 +00:00
Bruce Ashfield
08435d20b1 recipes/classes/scripts: Drop SRCPV usage
bitbake has been enhanced such that SRCPV is no longer needed in
PV to handle updating git hashes and task signatures.

We can simplify our PV by dropping SRCPV

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-08-24 01:38:21 +00:00
Bruce Ashfield
7867b58ca2 conmon: update to 2.1.7
Bumping conmon to version v2.1.3-74-g75f8ceb, which comprises the following commits:

    fa67ce6 ensure console socket buffers are properly sized
    2902909 Remove lgtm badge
    2832e4f chore(deps): update dependency containers/automation_images to v20230614
    7a7c893 log fds more permissive
    c26648e Fix close_other_fds on FreeBSD
    ebc6717 chore(deps): update dependency containers/automation_images to v20230601
    8225789 chore(deps): update dependency containers/automation_images to v20230517
    dcee6fb Update nixos image and dependencies' version.
    e907fdc Changes to build conmon for ppc64le
    5510eb0 fix compile regression on FreeBSD
    be144a1 chore(deps): update dependency containers/automation_images to v20230426
    3fcc1d2 Packit: update config
    676e86d ctrl: fix a debug statement
    b7aa7b1 [skip-ci] Update actions/setup-go action to v4
    d8bf969 [skip-ci] Update actions/checkout action to v3
    53debe6 [skip-ci] Update actions/cache action to v3
    758ff5a vendor: bump to latest packages
    44448e7 fix(deps): update module github.com/containers/libpod to v4
    95ecbf5 chore(deps): update dependency containers/automation_images to v20230405
    3b447bc conmon: drop return after pexit()
    d637b73 ctrl: make accept4 failures fatal
    cbc7c40 cmsg: recvfd returns an error on failures
    0251765 cmsg: fix program name
    5fcb8da ctrl: on EINTR retry accept4
    08c34bd Add renovate configuration
    9a3af8f logging: avoid opening /dev/null for each write

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-08-24 01:38:21 +00:00
Bruce Ashfield
ee212a38bc conmon: update to 2.1.3-tip
Bumping conmon to version v2.1.3-43-g9a3af8f, which comprises the following commits:

    9a3af8f logging: avoid opening /dev/null for each write
    813c8d7 oom: restore old OOM score
    9d3a955 Update CI VM images
    b1d7297 Use default umask `0022`
    54a0c9c exit: Free allocated string
    dbade0d version: bump to v2.1.7
    1841000 Fix leaking symbolic links in the opt_socket_path directory
    5cff0ce cgroup: Stumble on if we can't set up oom handling
    5f669ba bump to v2.1.6
    3dc09f6 packit: build in dedicated projects
    fffef27 hack: build ginkgo in GOPATH
    ef8a9f2 vendor bump ginkgo to v2
    b042229 gh actions: bump to go 1.20
    c002534 Use --detach instead of -d
    df277e2 Fix OOM watcher for cgroupv2 `oom_kill` events
    4cb1e4d Lint/format fixes for golang 1.19
    a10fe91 Update CI VM Images to F36/F37
    2d03ad0 ctrl: drop fifo perms to 0660
    8c72109 Fix tools/Makefile with GNU make 4.4
    6b600ac bump to v2.1.5
    28b3bc7 don't leak syslog_identifier
    f903e20 logging: do not read more that the buf size
    f4d3beb logging: fix error handling
    21f648b cli: Fix conmon-pidfile/container-pidfile description
    1df3e90 Makefile: Fix install for FreeBSD
    cb0c68b signal: Track changes to get_signal_descriptor in the FreeBSD version
    1fbfa33 Packit: initial enablement
    5e82bb4 bump to 2.1.4
    1420874 signal: handle SIGUSR1 with signalfd
    636e239 Use /usr/bin/env to locate bash

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-04-05 16:03:55 -04:00
Changqing Li
b2ab6a11a4 conmon: avoid host contamination by GOCACHE
By default GOCACHE is set to $HOME/.cache.

Fix:
make[1]: Entering directory '/mnt/tmp-glibc/work/core2-64-wrs-linux/conmon/2.1.3+gitAUTOINC+19110c9746-r0/git/tools'
| failed to initialize build cache at /home/build/.cache/go-build: mkdir /home/build: permission denied

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-12-01 16:58:17 -05:00
Bruce Ashfield
783e36d15e conmon: update to 2.1.3
Bumping conmon to version v2.1.3-5-g19110c9, which comprises the following commits:

    636e239 Use /usr/bin/env to locate bash
    d7625dc Cirrus: Add meta task to keep CI VM images alive
    ab52a59 VERSION: bump to 2.1.3
    a627951 meson: build with seccomp if available
    1750b2d Fix build on FreeBSD-13.0
    0a2e0db Reduce the amount of duplicated code between Linux and FreeBSD
    32816bd Port conmon to FreeBSD
    b1ca51f gh actions: bump versions
    05163fd bump golang in gh action to 1.18
    d91cc43 Stop using g_unix_signal_add() to avoid threads
    2bc95ee [Fixup #342] `log-size-global-max` Should Be`log-global-size-max`
    99eac3e bump to v2.1.2
    143121b log_global_max: ignore if negative
    98058b1 add log-global-size-max option to limit the total output conmon processes
    65b6eaa bump to v2.1.1
    81086b7 journald: print tag and name if both are specified
    c61367c logging: add missing static keyword
    0c3412a drop some logs to debug level
    4c41ec2 meson: Handle journald

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-08-25 22:55:48 -04:00
Bruce Ashfield
db45737c35 conmon: update to v2.1.0
Bumping conmon to version v2.1.0-316-g4c41ec2, which comprises the following commits:

    4c41ec2 meson: Handle journald
    d1565ee bump to v2.1.0
    96b8688 logging: buffer partial messages to journald
    f20bbbe ci: add podman system to different cache
    bde1b3c ci: install rootlessport right
    2b10f9a ci: install go correctly
    4f0b7f8 ci: add subid ranges for crio tests
    e827355 ci: install all binaries for podman-system
    ad092b1 ci: run vendor on podman job
    b6025be ci: set host IP
    ca12794 ci: give conmon job sudo
    d6bdb97 ci: bump to go 1.17
    e2215a1 exit: close all fds >= 3
    830e644 fix: cgroup: Free memory_cgroup_file_path if open fails. Call g_free instead of free.
    5a2cf98 Make libdl optional in meson definition
    4edfc92 bump to v2.0.33-dev
    436b460 bump to v2.0.32
    f1fee3a Avoid mainfd_std{in,out} sharing the same file descriptor.
    7c784a0 exit_command: unset subreaper attribute before running exit command
    dc197c9 bump to 2.0.32-dev
    7e7eb74 bump to 2.0.31
    a854c52 conmon: fix error message

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-03-21 17:31:28 -04:00
Bruce Ashfield
433417791e conmon: update to v2.0.30
Bumping conmon to version v2.0.1-288-ge67bb4d, which comprises the following commits:

    a854c52 conmon: fix error message
    5d5b853 logging: set SYSLOG_IDENTIFIER= with --log-tag
    ed0b60c conmon: free userdata files before exec cleanup
    42cecdf Cirrus: Remove disused scripts
    1c7b233 test: drop seccomp tests
    eb808d2 fix gh action yaml
    e7a5e0c ctr_logs: use container name or ID as SYSLOG_IDENTIFIER for journald
    f263cf4 logging: new mode -l passthrough
    f231c7f ctrl: delete the fifo if it exists
    7cfb1ac conmon_test: fix race condition on os.RemoveAll
    c657db7 integration: use the built binary
    fa1fa36 bump to v2.0.31-dev
    2792c16 bump to v2.0.30
    fec62f1 bump go version for podman tests
    89072ea Update VM Images + Drop prior-ubuntu references
    53c9f75 Remove unreachable code path
    9e54dda exit: report if the exit command was killed
    4d3dba9 exit: fix race zombie reaper
    c834521 conn_sock: allow watchdog messages through the notify socket proxy
    423c391 Add seccomp to build dependency
    9c23760 Update nixpkgs
    3a8c913 make: only define use_seccomp if we're using it
    1d67d9e Makefile: correctly check seccomp notify support
    e796a80 Makefile: make conditional-compilation variable setting uniform
    e83c392 Makefile: unify condition checking
    7381063 Cirrus: Remove outdated/wrong documentation
    4a8762d Cirrus: Fix references to 'master' branch
    1ef2468 Fix docs links due to branch rename

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-11-22 09:00:58 -05:00
Bruce Ashfield
0a7ae8bc50 global: convert github SRC_URIs to use https protocol
github is removing git:// access, and fetches will start experiencing
interruptions in service, and eventually will fail completely.

bitbake will also begin to warn on github src_uri's that don't use
https. So we convert the meta-virt instances to use protocol=https
(done using the oe-core contrib conversion script)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-11-02 09:57:03 -04:00
Martin Jansa
5c1388998d conmon: add dependency on libseccomp and seccomp to REQUIRED_DISTRO_FEATURES
* added with to v2.0.29 commit:
  106cad5 seccomp: add support for seccomp notify
* fixes:
  | src/seccomp_notify.c:9:10: fatal error: seccomp.h: No such file or directory
  |     9 | #include <seccomp.h>
  |       |          ^~~~~~~~~~~

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-06-24 12:40:22 -04:00
Bruce Ashfield
7a59023229 conmon: update to v2.0.29
Bumping conmon to version v2.0.1-250-g1ef2468, which comprises the following commits:

    1ef2468 Fix docs links due to branch rename
    24c73c2 seccomp: fix for unsupported versions
    fc7830d bump to v2.0.30-dev
    7e6de66 bump to v2.0.29
    b033cb5 Reset OOM score back to 0 for container runtime
    106cad5 seccomp: add support for seccomp notify
    77dfb4b .cirrus.yml: raise the timeout to 60m
    87330dc call functions registered with atexit on SIGTERM

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-06-21 08:52:18 -04:00
Bruce Ashfield
950b24b2d5 conmon: add branch specification to SRC_URI
The upstream project switched from master to main, so we add
an explicit branch specification to avoid fetch errors (as
the deafult of master no longer works).

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-06-21 08:52:18 -04:00
Bruce Ashfield
42cc70df20 conmon: update to v2.0.28
6b18f7e bump to v2.0.28
   dd63dcb Cirrus: Update VM Images
   096e2c1 conmon: do not chown /dev/null
   3efab3e Add Kubernetes e2e tests as GitHub action
   0114f3c move integration to gh actions
   186038c run make vendor
   31c5a2e add tests running a runtime
   c53c155 always set container pid file
   1955f59 write runtime stderr to journal on error
   af1f3c4 some small cleanups
   6c38b5a Use less resources
   355dbf1 conn_sock: fix potential segfault
   4587294 ci/gha: bump runc to rc93
   92867a7 Add Podman integration test GitHub action
   1ec43d9 bump to v2.0.28-dev

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-06-04 08:43:13 -04:00
Bruce Ashfield
78917f0db6 conmon: update to v2.0.27
Bumping to 2.0.27. Also, move to a _git suffix on the recipe.
We already had one bump that made the extension and PV be out
of sync. Since we track this by git increments, not release
or release tarballs, the _git is appropriate.

The following changes are part of this update:

   3efab3e Add Kubernetes e2e tests as GitHub action
   0114f3c move integration to gh actions
   186038c run make vendor
   31c5a2e add tests running a runtime
   c53c155 always set container pid file
   1955f59 write runtime stderr to journal on error
   af1f3c4 some small cleanups
   6c38b5a Use less resources
   355dbf1 conn_sock: fix potential segfault
   4587294 ci/gha: bump runc to rc93
   92867a7 Add Podman integration test GitHub action
   1ec43d9 bump to v2.0.28-dev
   65fad4b bump to v2.0.27
   dd99302 Add CRI-O integration test GitHub action
   911c786 exec: don't fail on EBADFD
   3ac015e close_fds: fix close of external fds
   1c7e6fb Add arm64 static build binary
   c3f31c0 bump to v2.0.27-dev

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-04-16 10:35:40 -04:00
Bruce Ashfield
7b8da52f5f conmon; update to 2.0.26
Updating to version 2.0.26. Along with the following commits, we
add a dependency on go-md2man-native, or the build will break.

   0e155c8 bump to v2.0.26
   2b87314 conn_sock: do not fail on EAGAIN
   de1a153 Update nix pin with `make nixpkgs`
   de1c681 bump to v2.0.26-dev
   05ce716 bump to v2.0.25
   d9bd8f8 conn_sock: fix double free
   3af2776 src: avoid unuseful strdup
   a7418c0 fix propagation of PREFIX variable to docs/Makefile
   0353110 bump to version 2.0.25-dev
   9cbc71d bump to version 2.0.24
   b39ce63 conn_sock: fix path opening
   37217a3 bump to version 2.0.24-dev
   0b961fc bump to version 2.0.23
   93f5b30 conn_sock: add full-attach option
   5e42e54 Update nix pin with `make nixpkgs`
   0f092d5 conmon: store open FDs and close only them
   43377e3 conn_sock: add function to close all readers
   e7e84a4 cgroup: store used file descriptors
   74d6c46 conmon: do not use invalid fd
   58d020a Update nix pin with `make nixpkgs`
   6287bd8 conn_sock: make dest fd non blocking
   715c680 bump to v2.0.23-dev
   9c34a86 bump to 2.0.22
   603154d conn_sock: Explicitly free a heap-allocated string
   5df41fb Add conmon man page
   7ae8f48 Update nix pin with `make nixpkgs`
   9c55220 set locale to inherit environment
   34e31d1 attach: always chdir
   16a59f5 Update nix pin with `make nixpkgs`
   af7f652 Cirrus: Use images from automation_images
   59c2817 Refactor I/O and add SD_NOTIFY proxy support
   eb93261 Update nix pin with `make nixpkgs`
   7cb7fd7 Fix problems found by codespell
   dc7b3c3 bump to v2.0.22-dev
   35a2fa8 bump to v2.0.21
   bc88ac5 protect against kill(-1)
   668b748 Makefile: enable debuginfo generation
   1d7b3a5 Remove go.sum file and add go.mod
   6eb222d Fail if conmon config could not be written
   9d61f0f nix: remove double definition for e2fsprogs
   76548e1 Speedup static build by utilizing CI cache on `/nix` folder
   4fe8ba9 Fix nix build for failing e2fsprogs tests
   7ab6aa1 test: fix CI
   5a6b2ac Use Podman for building
   fe1563c bump to v2.0.21-dev
   13244db bump to v2.0.20
   5bc12e0 logs: readd sync, but gate behavior on cli flag
   3055b86 bump to version 2.0.20-dev
   25585dd bump to version 2.0.19
   4fea27e handle children better
   64926b7 nix run -f channel:nixos-20.03
   eff699e Fix slave/master termonology
   2f5eb89 Reap PIDs before running exit command
   fc4b36b Update log-path parsing and unit-tests to handle a lot more edge cases.
   b6ff975 conmon: drop fsync calls
   02fcffe bump to v2.0.19-dev

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-02-06 12:19:00 -05:00
Ming Liu
65c40e6e57 conmon: uprev 2.0.11 > 2.0.18
Also drop useless SRC_URI[md5sum], SRC_URI[sha256sum] and FILES_${PN},
and add SRCPV to PV.

Signed-off-by: Ming Liu <ming.liu@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-07-24 13:09:01 -04:00
Stefan Agner
a97a12483a conmon: bump to version 2.0.11
Bump to latest version 2.0.11 of conmon.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-03-13 21:53:17 -04:00
Stefan Agner
7c42107c71 conmon: compile with journald support if systemd is enabled
Currently conman is compiled without journald support which leads to
this error message when trying to use it (e.g. --log-driver=journald
with podman):
  [conmon:e] Include journald in compilation path to log to systemd journal

Make sure to build with journald backend compiled-in when systemd is in
distro features by adding systemd to DEPENDS (through PACKAGECONFIG).

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-01-29 10:38:31 -05:00
Stefan Agner
179046584f conmon: bump to version 2.0.9
Bump to latest version 2.0.9. This also makes our Makefile fix obsolete
as the fix has been aplied upstream.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2020-01-17 16:24:59 -05:00
Stefan Agner
467ce521e7 conmon: initial add
Add conmon, a OCI container runtime monitor.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2019-10-02 14:13:35 -04:00