Commit Graph

9 Commits

Author SHA1 Message Date
Bruce Ashfield
cba2694dac podman-compose: switch 1.0.3 to stable branch
It looks like 'devel' in podman compose gets rewritten, so our
1.0.3 commit is no longer on that branch, breaking fetches.

Moving to stable and changing the commit to avoid the issue.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-06-01 12:41:54 -04:00
Bruce Ashfield
0ac7cbd51a podman-compose: update to 1.0.3
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-03-21 17:31:28 -04:00
Bruce Ashfield
108e089f7e global: update licence values to SPDX values
These changes are the result of running the convert-spdx-licenses.py
oe-core script.

There's no impact to the build, but we will avoid issues when
interacting with core QA by the alignment.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-02-18 13:07:10 -05:00
Bruce Ashfield
9148b795f3 podman-compose: update to 0.1.8
Bumping podman-compose to version 0.1.8-2-g1555417, which comprises the following commits:

    1555417 FIXES #361: key error _service
    1f989ed FIXES #356: respect pull_policy
    66ce2a3 release 0.1.8
    d8e11d5 FIXES #312: run starts dependencies
    72c3572 #289: exit code and test for that
    c187e88 up and down specific containers
    31b8bb4 simpler passing of env
    f177712 Fix `up` arguments parsing
    ae3deb1 #355: fix dry run
    117b7fb command list of strings
    5acb997 command list of strings
    02b2f65 Update issue templates
    a36b6f1 Update issue templates
    e3be6dd Update issue templates
    4b75678 Update issue templates
    dcb038e remove tabs
    a2fef56 FIXES #353: down in reverse order
    c753b8e FIXES #167: support ContainerFile
    c9486c9 #115: handle string entrypoint
    f2aeaba #348: conditional --infra-name
    2d80e43 remove print
    d1a77de external name
    c49f070 volumes with names
    6d69b7c Add support external volumes
    ab13503 add support for long port publishing format
    069018c #342: set infra container name
    b33c42b Readability fix for missing commands
    785f7ad Get version info with setup.cfg
    b6a9f8e #335: report version with -v
    4a5fd23 #275 make pipx happy
    dc0ac0d docs: added the transform_policy default and description
    502d7cc #327: accept ports as string
    e85d79d added cpu_shares flag for v2
    bfb57b9 added cpu_shares flag for v2
    2d0aad6 Also pull images with a build section
    ff5b9f1 Support for logging
    62aa337 feat(secrets):  Add support for secrets
    3836094 Update podman_compose.py
    d97a20d #308: fix environment
    f417c9a #120: extend not add
    5ed5528 FIXES #120: parse mem and cpu limits
    3d6ca3c FIXES #120: parse mem and cpu limits
    6e3383d Convert numeric command arguments to string (fixes #77)
    8ef7587 Fix some typos (found by codespell)
    039fe30 Make sure port entries are converted to strings
    62d2024 Add stop_signal service attribute
    9317f98 #278: args
    045cef2 #289: report exit code when --exit-code-from
    a7f97b6 implement -e in run
    0ea18b4 Force adding an .env file for the tests
    00840d0 resolve conflict
    2ad7daa Test variable interpolation in the YAML
    080b8a3 Prefer 'compose.yaml' as per compose spec
    226ac4f fix missing --label flag in volume creation
    030a196 Fix README typo
    901213e Update podman_compose.py
    b337060 Add support for sysctls in compose file
    b3090c3 Mode Python installation and test deps to requirement files
    5fabfee Support annotations
    75a63df fix: check `.env` in current dir with `isfile` instead of `exists`
    08dd36f Add docker-compose labels for interoperability
    669953b Rework argument generation to adhere directly to what podman accepts.
    d3df688 Remove test code
    bda7b5e Add exec support
    6289d25 fixes #236: compatible with docker-compose
    abc0813 Only pull each image once
    9cd837f Fixes #236: Ensure project name works with podman
    a4b8b5e Fix 'podman-compose version' with no compose file in the working directory
    5971f57 FIXES #249: update dotenv with some envs
    ab96f12 FIXES #249: update dotenv with some envs
    f6a3cb0 Allow environment variables to be unset
    497355f Re-order environment/env_files to match compose
    20a86ea add --no-cache arg to build
    4e2e960 build specific service
    efba3a1 support str style configuration for env_file
    9063976 BUG: 'podman stop -t 360.0' called for float, expects int on cli
    3712b54 ENH: add timeout option to podman-compose down, as in https://docs.docker.com/compose/reference/down/
    294f8ee Hashlib to generate SHA256 instead of MD5 for FIPS
    105b129 Fix infinite loop
    d3f3711 FIXES #181: accept init and init-path
    7eacf14 MAINT: resolve https://github.com/containers/podman-compose/pull/180#issuecomment-632722974
    8cd98ab MAINT: extend instead of append
    047820d ENH: Added restart policy forwarding to podmann run, compose build args added to up args
    e7b1382 Add --build-arg to 'up' (Fixes #161)
    64ed554 Allow empty default/error value in substitution
    93bf39e Add Security Policy
    5915ba3 Catch error when compose file is empty
    1ca6a88 target once
    7b40079 Pass "target" parameter when building an image.
    f9915c4 Check for target property when building images
    1973340 Add support for --build-arg option
    e8147e3 Add support for cap_add/cap_drop
    7f210ff fixing "Error: unknown flag: --shm_size"
    cbed801 start detached
    6a42d68 add ports test
    07a2430 Fixes #152: validate that podman is useable
    5215782 Fixes #152: validate that podman is useable
    03cbd29 pass volumes using -v
    796e6a4 Avoid crash when no services are defined
    efcbc75 Pass ulimit parameters when building container
    dacc753 Add Code of Conduct
    8c3b7e6 Added mount option delegated and cached
    147f0ae Update README with dnf install instructions.
    27d3caf Add support for privileged option
    e7a9bd3 Show stopped containers in ps
    ddd582c Add support for logs subcommand
    169eaee Fix override of the run command
    c5f8973  Mixed-case directory names break 'podman create'
    12036aa FIXES #76: a service extends a service with same name
    7222fdb exit if not files
    bb7120f Fix stop command runs start instead
    7ebbe2e Fix KeyErrors encountered with extended services
    29d4cdc Remove unused funtion in setup.py
    a9216c3 podman volume inspect mountPoint/Mountpoint
    e538852 #57: better ps via label
    b1c2b02 podman_compose.py
    9e0dd2d extends with external file
    72c1992 Remove never-shared options.
    3e2381f Support extends
    dee813a #47: version command
    9684429 #52: fix how we split commands
    87e7211 #54: fix ulimits
    7269701 Fixed get of ulimit tag, according to docker-compose specification
    b369073 Fix podman-compose run command parsing
    62f0cc4 Changed -l flag to --label in order to be compatible with Podman 1.0.2.dev
    c152d28 Support for generic  container-compose format
    8e43e69 FIX #41: compare original volume name
    751aaa8 Add support for devices in a service
    243bdb6 Add support for setting container ulimit
    2202e7f Add support for setting container ulimit
    f505e49 a test showing yaml anchor magic
    2e4378f add string check for cmd line args
    2a8d430 FIXES #35: now support multiple composer files
    a512c0c #35: test for multiple -f
    f008986 release 0.1.5

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-11-22 11:56:56 -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
Bruce Ashfield
d876cfc5bf global: overrides syntax conversion
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.

This is pass one of updating the meta-virt recipes to use that
syntax.

This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions

Note: A recent bitbake is required:

    commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
    Author: Richard Purdie <richard.purdie@linuxfoundation.org>
    Date:   Sun Jul 18 12:59:15 2021 +0100

        bitbake: data_smart/parse: Allow ':' characters in variable/function names

        It is becomming increasingly clear we need to find a way to show what
        is/is not an override in our syntax. We need to do this in a way which
        is clear to users, readable and in a way we can transition to.

        The most effective way I've found to this is to use the ":" charater
        to directly replace "_" where an override is being specified. This
        includes "append", "prepend" and "remove" which are effectively special
        override directives.

        This patch simply adds the character to the parser so bitbake accepts
        the value but maps it back to "_" internally so there is no behaviour
        change.

        This change is simple enough it could potentially be backported to older
        version of bitbake meaning layers using the new syntax/markup could
        work with older releases. Even if other no other changes are accepted
        at this time and we don't backport, it does set us on a path where at
        some point in future we could
        require a more explict syntax.

        I've tested this patch by converting oe-core/meta-yocto to the new
        syntax for overrides (9000+ changes) and then seeing that builds
        continue to work with this patch.

        (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)

        Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-08-02 17:17:53 -04:00
Martin Jansa
92f976404b podman-compose: remove pypi inherit to fix do_fetch
* now when pypi uses SRC_URI_prepend since:
  https://git.openembedded.org/openembedded-core/commit/?id=8f17b8bce85efb0e9a7e15d0b98a5cf7b6bd9750
  both entries end in SRC_URI (because of delayed nature of prepend):
  https://files.pythonhosted.org/packages/source/p/podman-compose/podman-compose-0.1.5.tar.gz
  git://github.com/containers/podman-compose.git

  causing:
  ERROR: podman-compose-0.1.5-r0 do_fetch: No checksum specified for '/OE/build/oe-core/downloads/podman-compose-0.1.5.tar.gz', please add at least one to the recipe:
  SRC_URI[sha256sum] = "fb229362f188980ea3fbdee2a25d0a2dd6a0b886d925d5213e22e09f1062ebe9"
  ERROR: podman-compose-0.1.5-r0 do_fetch: Fetcher failure for URL: 'https://files.pythonhosted.org/packages/source/p/podman-compose/podman-compose-0.1.5.tar.gz'. Missing SRC_URI checksum
  ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/podman-compose/0.1.5-r0/temp/log.do_fetch.55855

  drop pypi inherit to restore the previous SRC_URI with just the git:// entry.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-07-03 23:41:04 -04:00
Bruce Ashfield
f32657ae6e podman-compse: update to latet 0.15 hash
Updating to the latest commits, and switching to the named
'devel' branch (from master previously).

The following commits are part of this update:

   6289d25 fixes #236: compatible with docker-compose
   abc0813 Only pull each image once
   9cd837f Fixes #236: Ensure project name works with podman
   a4b8b5e Fix 'podman-compose version' with no compose file in the working directory
   5971f57 FIXES #249: update dotenv with some envs
   ab96f12 FIXES #249: update dotenv with some envs
   f6a3cb0 Allow environment variables to be unset
   497355f Re-order environment/env_files to match compose
   20a86ea add --no-cache arg to build
   4e2e960 build specific service
   efba3a1 support str style configuration for env_file
   9063976 BUG: 'podman stop -t 360.0' called for float, expects int on cli
   3712b54 ENH: add timeout option to podman-compose down, as in https://docs.docker.com/compose/reference/down/
   294f8ee Hashlib to generate SHA256 instead of MD5 for FIPS
   105b129 Fix infinite loop
   d3f3711 FIXES #181: accept init and init-path
   7eacf14 MAINT: resolve https://github.com/containers/podman-compose/pull/180#issuecomment-632722974
   8cd98ab MAINT: extend instead of append
   047820d ENH: Added restart policy forwarding to podmann run, compose build args added to up args
   e7b1382 Add --build-arg to 'up' (Fixes #161)
   64ed554 Allow empty default/error value in substitution
   93bf39e Add Security Policy
   5915ba3 Catch error when compose file is empty
   1ca6a88 target once
   7b40079 Pass "target" parameter when building an image.
   f9915c4 Check for target property when building images
   1973340 Add support for --build-arg option
   e8147e3 Add support for cap_add/cap_drop
   7f210ff fixing "Error: unknown flag: --shm_size"
   cbed801 start detached
   6a42d68 add ports test
   07a2430 Fixes #152: validate that podman is useable
   5215782 Fixes #152: validate that podman is useable
   03cbd29 pass volumes using -v
   796e6a4 Avoid crash when no services are defined
   efcbc75 Pass ulimit parameters when building container
   dacc753 Add Code of Conduct
   8c3b7e6 Added mount option delegated and cached
   147f0ae Update README with dnf install instructions.
   27d3caf Add support for privileged option
   e7a9bd3 Show stopped containers in ps
   ddd582c Add support for logs subcommand
   169eaee Fix override of the run command
   c5f8973  Mixed-case directory names break 'podman create'
   12036aa FIXES #76: a service extends a service with same name
   7222fdb exit if not files
   bb7120f Fix stop command runs start instead
   7ebbe2e Fix KeyErrors encountered with extended services
   29d4cdc Remove unused funtion in setup.py
   a9216c3 podman volume inspect mountPoint/Mountpoint
   e538852 #57: better ps via label
   b1c2b02 podman_compose.py
   9e0dd2d extends with external file
   72c1992 Remove never-shared options.
   3e2381f Support extends
   dee813a #47: version command
   9684429 #52: fix how we split commands
   87e7211 #54: fix ulimits
   7269701 Fixed get of ulimit tag, according to docker-compose specification
   b369073 Fix podman-compose run command parsing
   62f0cc4 Changed -l flag to --label in order to be compatible with Podman 1.0.2.dev
   c152d28 Support for generic  container-compose format
   8e43e69 FIX #41: compare original volume name
   751aaa8 Add support for devices in a service
   243bdb6 Add support for setting container ulimit
   2202e7f Add support for setting container ulimit
   f505e49 a test showing yaml anchor magic
   2e4378f add string check for cmd line args
   2a8d430 FIXES #35: now support multiple composer files
   a512c0c #35: test for multiple -f

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-02-06 13:02:10 -05:00
Stefan Agner
4d6edd4fc5 podman-compose: move into subdirectory
The layer does not expect recipes in the first subdir. Move the
podman-compose recipe into a podman-compose subdirectory.

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