release 0.1.11

Without this, I get errors when running "podman-compose -p podname run".

.github/ISSUE_TEMPLATE/bug_report.md

@@ -35,7 +35,7 @@ What is the behavior you actually got and that should not happen.
 ```
 $ podman-compose version
 using podman version: 3.4.0
-podman-compose version  0.1.7dev
+podman-composer version  0.1.7dev
 podman --version 
 podman version 3.4.0
 

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/pylint.yml

@@ -1,41 +0,0 @@
-name: Pylint
-
-on:
-- push
-- pull_request
-
-jobs:
-  lint-black:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install psf/black requirements
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y python3 python3-venv
-    - uses: psf/black@stable
-      with:
-        options: "--check --verbose"
-        version: "~= 23.3"
-
-  lint-pylint:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        pip install pylint
-    - name: Analysing the code with pylint
-      run: |
-        python -m compileall podman_compose.py
-        pylint podman_compose.py
-        # pylint $(git ls-files '*.py')

.github/workflows/pytest.yml

@@ -1,36 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: PyTest
-
-on:
-  push:
-    branches: [ devel ]
-  pull_request:
-    branches: [ devel ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        python -m pytest ./pytests
-

.pre-commit-config.yaml

@@ -1,32 +0,0 @@
-repos:
-  - repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-      - id: black
-        # It is recommended to specify the latest version of Python
-        # supported by your project here, or alternatively use
-        # pre-commit's default_language_version, see
-        # https://pre-commit.com/#top_level-default_language_version
-        language_version: python3.10
-        types: [python]
-        args: [
-          "--check",  # Don't apply changes automatically
-        ]
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        types: [python]
-  - repo: local
-    hooks:
-      - id: pylint
-        name: pylint
-        entry: pylint
-        language: system
-        types: [python]
-        args:
-          [
-            "-rn", # Only display messages
-            "-sn", # Don't display the score
-            "--rcfile=.pylintrc", # Link to your config file
-          ]

.pylintrc

@@ -1,18 +1,13 @@
 [MESSAGES CONTROL]
-# C0111 missing-docstring: missing-class-docstring, missing-function-docstring, missing-method-docstring, missing-module-docstrin
-# consider-using-with: we need it for color formatter pipe
-disable=too-many-lines,too-many-branches,too-many-locals,too-many-statements,too-many-arguments,too-many-instance-attributes,fixme,multiple-statements,missing-docstring,line-too-long,consider-using-f-string,consider-using-with,unnecessary-lambda-assignment
+disable=W0614,C0410,C0321,C0111,I0011,C0103
 # allow _ for ignored variables
 # allow generic names like a,b,c and i,j,k,l,m,n and x,y,z
 # allow k,v for key/value
-# allow e for exceptions, it for iterator, ix for index
-# allow ip for ip address
+# allow e for exceptions, it for iterator
 # allow w,h for width, height
 # allow op for operation/operator/opcode
 # allow t, t0, t1, t2, and t3 for time
 # allow dt for delta time
 # allow db for database
 # allow ls for list
-# allow p for pipe
-# allow ex for examples, exists ..etc
-good-names=_,a,b,c,dt,db,e,f,fn,fd,i,j,k,v,kv,kw,l,m,n,ls,t,t0,t1,t2,t3,w,h,x,y,z,it,ix,ip,op,p,ex
+good-names=_,a,b,c,dt,db,e,f,fn,fd,i,j,k,v,kv,kw,l,m,n,ls,t,t0,t1,t2,t3,w,h,x,y,z,it,op

CONTRIBUTING.md

@@ -1,49 +1,5 @@
 # Contributing to podman-compose
 
-## Who can contribute? 
-
-- Users that found a bug
-- Users that wants to propose new functionalities or enhancements
-- Users that want to help other users to troubleshoot their environments
-- Developers that want to fix bugs
-- Developers that want to implement new functionalities or enhancements
-
-## Branches
-
-Please request your PR to be merged into the `devel` branch. 
-Changes to the `stable` branch are managed by the repository maintainers.
-
-## Development environment setup
-
-Note: Some steps are OPTIONAL but all are RECOMMENDED.
-
-1. Fork the project repo and clone it
-```shell
-$ git clone https://github.com/USERNAME/podman-compose.git
-$ cd podman-compose
-```
-1. (OPTIONAL) Create a python virtual environment. Example using [virtualenv wrapper](https://virtualenvwrapper.readthedocs.io/en/latest/): 
-```shell
-mkvirtualenv podman-compose
-```
-2. Install the project runtime and development requirements   
-```shell
-$ pip install '.[devel]'
-```
-3. (OPTIONAL) Install `pre-commit` git hook scripts (https://pre-commit.com/#3-install-the-git-hook-scripts)
-```shell
-$ pre-commit install
-```
-4. Create a new branch, develop and add tests when possible
-5. Run linting & testing before commiting code. Ensure all the hooks are passing.
-```shell
-$ pre-commit run --all-files
-```
-6. Commit your code to your fork's branch. 
-   - Make sure you include a `Signed-off-by` message in your commits. Read [this guide](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) to learn how to sign your commits 
-   - In the commit message reference the Issue ID that your code fixes and a brief description of the changes. Example: `Fixes #516: allow empty network`
-7. Open a PR to `containers/podman-compose:devel` and wait for a maintainer to review your work.
-
 ## Adding new commands
 
 To add a command you need to add a function that is decorated
@@ -104,11 +60,15 @@ def compose_up(compose, args):
   create             Create services
   events             Receive real time events from containers
   images             List images
+  kill               Kill containers
   logs               View output from containers
+  pause              Pause services
   port               Print the public port for a port binding
   ps                 List containers
   rm                 Remove stopped containers
   run                Run a one-off command
   scale              Set number of containers for a service
   top                Display the running processes
+  unpause            Unpause services
+  version            Show the Docker-Compose version information
 ```

README.md

@@ -1,55 +1,44 @@
 # Podman Compose
-## [![Pylint Test: ](https://github.com/containers/podman-compose/actions/workflows/pylint.yml/badge.svg)](https://github.com/containers/podman-compose/actions/workflows/pylint.yml) [![Unit tests  PyTest](https://github.com/containers/podman-compose/actions/workflows/pytest.yml/badge.svg)](https://github.com/containers/podman-compose/actions/workflows/pytest.yml)
 
+An implementation of `docker-compose` with [Podman](https://podman.io/) backend.
+The main objective of this project is to be able to run `docker-compose.yml` unmodified and rootless.
+This project is aimed to provide drop-in replacement for `docker-compose`,
+and it's very useful for certain cases because:
 
-An implementation of [Compose Spec](https://compose-spec.io/) with [Podman](https://podman.io/) backend.
-This project focuses on:
+- can run rootless
+- no daemon, no setup.
+- can be used by developers to run single-machine containerized stacks using single familiar YAML file
 
-* rootless
-* daemon-less process model, we directly execute podman, no running daemon.
-
-This project only depends on:
+This project only depend on:
 
 * `podman`
-* [podman dnsname plugin](https://github.com/containers/dnsname): It is usually found in the `podman-plugins` or `podman-dnsname` distro packages, those packages are not pulled by default and you need to install them. This allows containers to be able to resolve each other if they are on the same CNI network.
 * Python3
 * [PyYAML](https://pyyaml.org/)
 * [python-dotenv](https://pypi.org/project/python-dotenv/)
 
-And it's formed as a single Python file script that you can drop into your PATH and run.
+And it's formed as a single python file script that you can drop into your PATH and run.
 
-## References:
-
-* [spec.md](https://github.com/compose-spec/compose-spec/blob/master/spec.md)
-* [docker-compose compose-file-v3](https://docs.docker.com/compose/compose-file/compose-file-v3/)
-* [docker-compose compose-file-v2](https://docs.docker.com/compose/compose-file/compose-file-v2/)
-
-## Alternatives
-
-As in [this article](https://fedoramagazine.org/use-docker-compose-with-podman-to-orchestrate-containers-on-fedora/) you can setup a `podman.socket` and use unmodified `docker-compose` that talks to that socket but in this case you lose the process-model (ex. `docker-compose build` will send a possibly large context tarball to the daemon)
 
 For production-like single-machine containerized environment consider
 
 - [k3s](https://k3s.io) | [k3s github](https://github.com/rancher/k3s)
 - [MiniKube](https://minikube.sigs.k8s.io/)
+- [MiniShift](https://www.okd.io/minishift/)
+
 
 For the real thing (multi-node clusters) check any production
-OpenShift/Kubernetes distribution like [OKD](https://www.okd.io/).
+OpenShift/Kubernetes distribution like [OKD](https://www.okd.io/minishift/).
 
 ## Versions
 
-If you have legacy version of `podman` (before 3.1.0) you might need to stick with legacy `podman-compose` `0.1.x` branch.
+If you have legacy version of `podman` (before 3.x) you might need to stick with legacy `podman-compose` `0.1.x` branch.
 The legacy branch 0.1.x uses mappings and workarounds to compensate for rootless limitations.
 
-Modern podman versions (>=3.4) do not have those limitations, and thus you can use latest and stable 1.x branch.
-
-If you are upgrading from `podman-compose` version `0.1.x` then we no longer have global option `-t` to set mapping type
-like `hostnet`. If you desire that behavior, pass it the standard way like `network_mode: host` in the YAML.
-
+Modern podman versions (>=3.4) do not have those limitations and thus you can use latest and stable 1.x branch.
 
 ## Installation
 
-Install the latest stable version from PyPI:
+Install latest stable version from PyPI:
 
 ```
 pip3 install podman-compose
@@ -63,6 +52,19 @@ Or latest development version from GitHub:
 pip3 install https://github.com/containers/podman-compose/archive/devel.tar.gz
 ```
 
+or
+
+```
+curl -o /usr/local/bin/podman-compose https://raw.githubusercontent.com/containers/podman-compose/devel/podman_compose.py
+chmod +x /usr/local/bin/podman-compose
+```
+
+or 
+
+```
+curl -o ~/.local/bin/podman-compose https://raw.githubusercontent.com/containers/podman-compose/devel/podman_compose.py
+chmod +x ~/.local/bin/podman-compose
+```
 
 or install from Fedora (starting from f31) repositories:
 
@@ -73,8 +75,6 @@ sudo dnf install podman-compose
 ## Basic Usage
 
 We have included fully functional sample stacks inside `examples/` directory.
-You can get more examples from [awesome-compose](https://github.com/docker/awesome-compose).
-
 
 A quick example would be
 
@@ -95,21 +95,19 @@ which have
 - a django tasks
 
 
-When testing the `AWX3` example, if you got errors, just wait for db migrations to end.
-There is also AWX 17.1.0
+When testing the `AWX3` example, if you got errors just wait for db migrations to end. 
+
 
 ## Tests
 
 Inside `tests/` directory we have many useless docker-compose stacks
-that are meant to test as many cases as we can to make sure we are compatible
+that are meant to test as much cases as we can to make sure we are compatible
 
-### Unit tests with pytest
-run a pytest with following command
+## How it works
 
-```shell
-python -m pytest pytests
-```
+The default mapping `1podfw` creates a single pod and attach all containers to
+its network namespace so that all containers talk via localhost.
+For more information see [docs/Mappings.md](docs/Mappings.md).
 
-# Contributing guide
+If you are running as root, you might use identity mapping.
 
-If you are a user or a developer and want to contribute please check the [CONTRIBUTING](CONTRIBUTING.md) section

completion/bash/podman-compose

@@ -1,411 +0,0 @@
-# Naming convention:
-# * _camelCase for function names
-# * snake_case for variable names
-
-# all functions will return 0 if they successfully complete the argument
-# (or establish there is no need or no way to complete), and something
-# other than 0 if that's not the case
-
-# complete arguments to global options
-_completeGlobalOptArgs() {
-    # arguments to options that take paths as arguments: complete paths
-    for el in ${path_arg_global_opts}; do
-        if [[ ${prev} == ${el} ]]; then
-            COMPREPLY=( $(compgen -f -- ${cur}) )
-            return 0
-        fi
-    done
-
-    # arguments to options that take generic arguments: don't complete
-    for el in ${generic_arg_global_opts}; do
-        if [[ ${prev} == ${el} ]]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-# complete root subcommands and options
-_completeRoot() {
-    # if we're completing an option
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${global_opts}" -- ${cur}) )
-        return 0
-    fi
-    # complete root commands
-    COMPREPLY=( $(compgen -W "${root_commands}" -- ${cur}) )
-    return 0
-}
-
-# complete names of Compose services
-_completeServiceNames() {
-    # ideally we should complete service names,
-    # but parsing the compose spec file in the
-    # completion script is quite complex
-    return 0
-}
-
-# complete commands to run inside containers
-_completeCommand() {
-    # we would need to complete commands to run inside
-    # a container
-    return 0
-}
-
-
-# complete the arguments for `podman-compose up` and return 0
-_completeUpArgs() {
-    up_opts="${help_opts} -d --detach --no-color --quiet-pull --no-deps --force-recreate --always-recreate-deps --no-recreate --no-build --no-start --build --abort-on-container-exit -t --timeout -V --renew-anon-volumes --remove-orphans --scale --exit-code-from --pull --pull-always --build-arg --no-cache"
-    if [[ ${prev} == "--scale" || ${prev} == "-t" || ${prev} == "--timeout" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${up_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-
-}
-
-# complete the arguments for `podman-compose exec` and return 0
-_completeExecArgs() {
-    exec_opts="${help_opts} -d --detach --privileged -u --user -T --index -e --env -w --workdir"
-    if [[ ${prev} == "-u" || ${prev} == "--user" || ${prev} == "--index" || ${prev} == "-e" || ${prev} == "--env" || ${prev} == "-w" || ${prev} == "--workdir" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${exec_opts}" -- ${cur}) )
-        return 0
-    elif [[ ${comp_cword_adj} -eq 2 ]]; then
-        # complete service name
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-    elif [[ ${comp_cword_adj} -eq 3 ]]; then
-        _completeCommand
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-
-}
-
-
-# complete the arguments for `podman-compose down` and return 0
-_completeDownArgs() {
-    down_opts="${help_opts} -v --volumes -t --timeout --remove-orphans"
-    if [[ ${prev} == "-t" || ${prev} == "--timeout" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${down_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-
-}
-
-
-# complete the arguments for `podman-compose build` and return 0
-_completeBuildArgs() {
-    build_opts="${help_opts} --pull --pull-always --build-arg --no-cache"
-    if [[ ${prev} == "--build-arg" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${build_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose logs` and return 0
-_completeLogsArgs() {
-    logs_opts="${help_opts} -f --follow -l --latest -n --names --since -t --timestamps --tail --until"
-    if [[ ${prev} == "--since" || ${prev} == "--tail" || ${prev} == "--until" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${logs_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose ps` and return 0
-_completePsArgs() {
-    ps_opts="${help_opts} -q --quiet"
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${ps_opts}" -- ${cur}) )
-        return 0
-    else
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose pull` and return 0
-_completePullArgs() {
-    pull_opts="${help_opts} --force-local"
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${pull_opts}" -- ${cur}) )
-        return 0
-    else
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose push` and return 0
-_completePushArgs() {
-    push_opts="${help_opts} --ignore-push-failures"
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${push_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose restart` and return 0
-_completeRestartArgs() {
-    restart_opts="${help_opts} -t --timeout"
-    if [[ ${prev} == "-t" || ${prev} == "--timeout" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${restart_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose stop` and return 0
-_completeStopArgs() {
-    stop_opts="${help_opts} -t --timeout"
-    if [[ ${prev} == "-t" || ${prev} == "--timeout" ]]; then
-        return 0
-    elif [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${stop_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose start` and return 0
-_completeStartArgs() {
-    start_opts="${help_opts}"
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${start_opts}" -- ${cur}) )
-        return 0
-    else
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-        return 0
-    fi
-}
-
-# complete the arguments for `podman-compose run` and return 0
-_completeRunArgs() {
-    run_opts="${help_opts} -d --detach --privileged -u --user -T --index -e --env -w --workdir"
-    if [[ ${prev} == "-u" || ${prev} == "--user" || ${prev} == "--index" || ${prev} == "-e" || ${prev} == "--env" || ${prev} == "-w" || ${prev} == "--workdir" ]]; then
-        return 0
-    elif  [[ ${cur} == -* ]]; then
-        COMPREPLY=( $(compgen -W "${run_opts}" -- ${cur}) )
-        return 0
-    elif [[ ${comp_cword_adj} -eq 2 ]]; then
-        # complete service name
-        _completeServiceNames
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-    elif [[ ${comp_cword_adj} -eq 3 ]]; then
-        _completeCommand
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-    fi
-}
-
-
-_podmanCompose() {
-    cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-    root_commands="help version pull push build up down ps run exec start stop restart logs"
-
-    # options to output help text (used as global and subcommand options)
-    help_opts="-h --help"
-
-    # global options that don't take additional arguments
-    basic_global_opts="${help_opts} -v --no-ansi --no-cleanup --dry-run" 
-
-    # global options that take paths as arguments
-    path_arg_global_opts="-f --file --podman-path"
-    path_arg_global_opts_array=($arg_global_opts)
-
-    # global options that take arguments that are not files
-    generic_arg_global_opts="-p --project-name --podman-path --podman-args --podman-pull-args --podman-push-args --podman-build-args --podman-inspect-args --podman-run-args --podman-start-args --podman-stop-args --podman-rm-args --podman-volume-args"
-    generic_arg_global_opts_array=($generic_arg_global_opts)
-
-    # all global options that take arguments
-    arg_global_opts="${path_arg_global_opts} ${generic_arg_global_opts}"
-    arg_global_opts_array=($arg_global_opts)
-
-    # all global options
-    global_opts="${basic_global_opts} ${arg_global_opts}"
-
-    chosen_root_command=""
-
-
-    _completeGlobalOptArgs
-    if [[ $? -eq 0 ]]; then
-        return 0
-    fi
-   
-    # computing comp_cword_adj, which thruthfully tells us how deep in the subcommands tree we are
-    # additionally, set the chosen_root_command if possible
-    comp_cword_adj=${COMP_CWORD}
-    if [[ ${COMP_CWORD} -ge 2 ]]; then
-        skip_next="no"
-        for el in ${COMP_WORDS[@]}; do
-            # if the user has asked for help text there's no need to complete further
-            if [[ ${el} == "-h" || ${el} == "--help" ]]; then
-                return 0
-            fi
-            if [[ ${skip_next} == "yes" ]]; then
-                let "comp_cword_adj--"
-                skip_next="no"
-                continue
-            fi
-            if [[ ${el} == -* && ${el} != ${cur} ]]; then
-                let "comp_cword_adj--"
-                
-                for opt in ${arg_global_opts_array[@]}; do
-                    if [[ ${el} == ${opt} ]]; then
-                        skip_next="yes"
-                    fi
-                done
-            elif [[ ${el} != ${cur} && ${el} != ${COMP_WORDS[0]} && ${chosen_root_command} == "" ]]; then
-                chosen_root_command=${el}
-            fi
-        done
-    fi
-    
-    if [[ ${comp_cword_adj} -eq 1 ]]; then
-       _completeRoot
-
-       # Given that we check the value of comp_cword_adj outside
-       # of it, at the moment _completeRoot should always return
-       # 0, this is just here in case changes are made. The same
-       # will apply to similar functions below
-        if [[ $? -eq 0 ]]; then
-            return 0
-        fi
-    fi
-    case $chosen_root_command in
-        up)
-            _completeUpArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        down)
-            _completeDownArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        exec)
-            _completeExecArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        build)
-            _completeBuildArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        logs)
-            _completeLogsArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        ps)
-            _completePsArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        pull)
-            _completePullArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        push)
-            _completePushArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        restart)
-            _completeRestartArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        start)
-            _completeStartArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        stop)
-            _completeStopArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-        run)
-            _completeRunArgs
-            if [[ $? -eq 0 ]]; then
-                return 0
-            fi
-            ;;
-    esac
-}
-
-complete -F _podmanCompose podman-compose

examples/awx17/roles/local_docker/tasks/set_image.yml

@@ -1,7 +1,7 @@
 ---
 - name: Manage AWX Container Images
   block:
-    - name: Export Docker awx image if it isn't local and there isn't a registry defined
+    - name: Export Docker awx image if it isnt local and there isnt a registry defined
       docker_image:
         name: "{{ awx_image }}"
         tag: "{{ awx_version }}"

examples/azure-vote/README.md

@@ -1,17 +0,0 @@
-# Azure Vote Example
-
-This example have two containers:
-
-* backend: `redis` used as storage
-* frontend: having supervisord, nginx, uwsgi/python
-
-
-```
-echo "HOST_PORT=8080" > .env
-podman-compose up
-```
-
-after typing the commands above open your browser on the host port you picked above like
-[http://localhost:8080/](http://localhost:8080/)
-
-

examples/azure-vote/docker-compose.yaml

@@ -1,16 +0,0 @@
----
-# from https://github.com/Azure-Samples/azure-voting-app-redis/blob/master/docker-compose.yaml
-version: '3'
-services:
-  azure-vote-back:
-    image: mcr.microsoft.com/oss/bitnami/redis:6.0.8
-    container_name: azure-vote-back
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-  azure-vote-front:
-    image: mcr.microsoft.com/azuredocs/azure-vote-front:v1
-    environment:
-      REDIS: azure-vote-back
-    ports:
-        - "${HOST_PORT:-8080}:80"
-

examples/echo/README.md

@@ -1,31 +0,0 @@
-# Echo Service example
-
-```
-podman-compose up
-```
-
-Test the service with `curl like this`
-
-```
-$ curl -X POST -d "foobar" http://localhost:8080/; echo
-
-CLIENT VALUES:
-client_address=10.89.31.2
-command=POST
-real path=/
-query=nil
-request_version=1.1
-request_uri=http://localhost:8080/
-
-SERVER VALUES:
-server_version=nginx: 1.10.0 - lua: 10001
-
-HEADERS RECEIVED:
-accept=*/*
-content-length=6
-content-type=application/x-www-form-urlencoded
-host=localhost:8080
-user-agent=curl/7.76.1
-BODY:
-foobar
-```

examples/echo/docker-compose.yaml

@@ -1,8 +0,0 @@
----
-version: '3'
-services:
-  web:
-    image: k8s.gcr.io/echoserver:1.4
-    ports:
-        - "${HOST_PORT:-8080}:8080"
-

examples/hello-app-redis/README.md

@@ -1,12 +0,0 @@
-# GCR Hello App Redis
-
-A 6-node redis cluster using [Bitnami](https://github.com/bitnami/bitnami-docker-redis-cluster)
-with a [simple hit counter](https://github.com/GoogleCloudPlatform/kubernetes-engine-samples/tree/main/hello-app-redis) that persists on that redis cluster
-
-```
-podman-compose up
-```
-
-then open your browser on [http://localhost:8080/](http://localhost:8080/)
-
-

examples/hello-app-redis/docker-compose.yaml

@@ -1,67 +0,0 @@
----
-version: '3'
-volumes:
-  redis-node1-data:
-  redis-node2-data:
-  redis-node3-data:
-  redis-node4-data:
-  redis-node5-data:
-  redis-data:
-services:
-  web:
-    image: gcr.io/google-samples/hello-app-redis:1.0
-    depends_on:
-      - redis-cluster
-    ports:
-        - "${HOST_PORT:-8080}:8080"
-  redis-node1:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-node1-data:/bitnami/redis/data
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-  redis-node2:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-node2-data:/bitnami/redis/data
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-  redis-node3:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-node3-data:/bitnami/redis/data
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-  redis-node4:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-node4-data:/bitnami/redis/data
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-  redis-node5:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-node5-data:/bitnami/redis/data
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-
-  redis-cluster:
-    image: docker.io/bitnami/redis-cluster:6.2
-    volumes:
-      - redis-data:/bitnami/redis/data
-    depends_on:
-      - redis-node1
-      - redis-node2
-      - redis-node3
-      - redis-node4
-      - redis-node5
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_NODES=redis-node1 redis-node2 redis-node3 redis-node4 redis-node5 redis-cluster
-      - REDIS_CLUSTER_CREATOR=yes
-

examples/hello-app/README.md

@@ -1,10 +0,0 @@
-# GCR Hello App
-
-A small ~2MB image, type
-
-```
-podman-compose up
-```
-
-then open your browser on [http://localhost:8080/](http://localhost:8080/)
-

examples/hello-app/docker-compose.yaml

@@ -1,8 +0,0 @@
----
-version: '3'
-services:
-  web:
-    image: gcr.io/google-samples/hello-app:1.0
-    ports:
-        - "${HOST_PORT:-8080}:8080"
-

examples/hello-python/Dockerfile

@@ -1,12 +0,0 @@
-FROM python:3.9-alpine
-
-WORKDIR /usr/src/app
-
-COPY requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-CMD [ "python", "-m", "app.web" ]
-EXPOSE 8080
-

examples/hello-python/README.md

@@ -1,8 +0,0 @@
-# Simple Python Demo
-## A Redis counter
-
-```
-podman-compose up -d
-curl localhost:8080/
-curl localhost:8080/hello.json
-```

examples/hello-python/app/web.py

@@ -1,39 +0,0 @@
-# pylint: disable=import-error
-# pylint: disable=unused-import
-import os
-import asyncio  # noqa: F401
-
-import aioredis
-from aiohttp import web
-
-REDIS_HOST = os.environ.get("REDIS_HOST", "localhost")
-REDIS_PORT = int(os.environ.get("REDIS_PORT", "6379"))
-REDIS_DB = int(os.environ.get("REDIS_DB", "0"))
-
-redis = aioredis.from_url(f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}")
-app = web.Application()
-routes = web.RouteTableDef()
-
-
-@routes.get("/")
-async def hello(request):  # pylint: disable=unused-argument
-    counter = await redis.incr("mycounter")
-    return web.Response(text=f"counter={counter}")
-
-
-@routes.get("/hello.json")
-async def hello_json(request):  # pylint: disable=unused-argument
-    counter = await redis.incr("mycounter")
-    data = {"counter": counter}
-    return web.json_response(data)
-
-
-app.add_routes(routes)
-
-
-def main():
-    web.run_app(app, port=8080)
-
-
-if __name__ == "__main__":
-    main()

examples/hello-python/docker-compose.yaml

@@ -1,21 +0,0 @@
----
-version: '3'
-volumes:
-  redis:
-services:
-  redis:
-    read_only: true
-    image: docker.io/redis:alpine
-    command: ["redis-server", "--appendonly", "yes", "--notify-keyspace-events", "Ex"]
-    volumes:
-    - redis:/data
-  web:
-    read_only: true
-    build:
-      context: .
-    image: hello-py-aioweb
-    ports:
-    - 8080:8080
-    environment:
-      REDIS_HOST: redis
-

examples/hello-python/requirements.txt

@@ -1,3 +0,0 @@
-aiohttp
-aioredis
-# aioredis[hiredis]

examples/nodeproj/.eslintrc.json

@@ -1,71 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "es6": true
-  },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "extensions": [".js", ".mjs", ".ts", ".cjs"]
-      }
-    }
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-    "allowImportExportEverywhere": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:import/errors",
-    "plugin:import/warnings",
-    "plugin:import/typescript",
-    "plugin:promise/recommended",
-    "google",
-    "plugin:security/recommended"
-  ],
-  "plugins": ["promise", "security", "import"],
-  "overrides": [
-    {
-      "files": "public/**/*.min.js",
-      "env": {
-        "browser": true,
-        "node": false,
-        "es6": false
-      },
-      "parserOptions": {
-        "sourceType": "script"
-      },
-      "extends": ["plugin:compat/recommended"],
-      "plugins": [],
-      "rules": {
-        "no-var": ["off"]
-      }
-    }
-  ],
-  "rules": {
-    "security/detect-non-literal-fs-filename":["off"],
-    "security/detect-object-injection":["off"],
-    "camelcase": ["off"],
-    "no-console": ["off"],
-    "require-jsdoc": ["off"],
-    "one-var": ["off"],
-    "guard-for-in": ["off"],
-    "max-len": [
-      "warn",
-      {
-        "ignoreComments": true,
-        "ignoreTrailingComments": true,
-        "ignoreUrls": true,
-        "code": 200
-      }
-    ],
-    "indent": ["warn", 4],
-    "no-unused-vars": ["warn"],
-    "no-extra-semi": ["warn"],
-    "linebreak-style": ["error", "unix"],
-    "quotes": ["warn", "double"],
-    "semi": ["error", "always"]
-  }
-}

examples/nodeproj/.gitignore

@@ -1,5 +0,0 @@
-local.env
-.env
-*.pid
-node_modules
-

examples/nodeproj/.home/.gitignore

@@ -1 +0,0 @@
-*

examples/nodeproj/README.md

@@ -1,16 +0,0 @@
-# How to run example
-
-
-
-```
-cp example.local.env local.env
-cp example.env .env
-cat local.env
-cat .env
-echo "UID=$UID" >> .env
-cat .env
-podman-compose build
-podman-compose run --rm --no-deps init
-podman-compose up
-```
-

examples/nodeproj/containers/node16-runtime/Dockerfile

@@ -1,12 +0,0 @@
-FROM registry.fedoraproject.org/fedora-minimal:35
-ARG NODE_VER=16
-# microdnf -y module enable nodejs:${NODE_VER}
-RUN \
-  echo -e "[nodejs]\nname=nodejs\nstream=${NODE_VER}\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module && \
-  microdnf -y install shadow-utils nodejs zopfli findutils busybox && \
-  microdnf clean all
-RUN adduser -d /app app && mkdir -p /app/code/.home && chown app:app -R /app/code && chmod 711 /app /app/code/.home && usermod -d /app/code/.home app
-ENV XDG_CONFIG_HOME=/app/code/.home
-ENV HOME=/app/code/.home
-WORKDIR /app/code
-

examples/nodeproj/docker-compose.yml

@@ -1,48 +0,0 @@
-version: '3'
-volumes:
-  redis:
-services:
-  redis:
-    read_only: true
-    image: docker.io/redis:alpine
-    command: ["redis-server", "--appendonly", "yes", "--notify-keyspace-events", "Ex"]
-    volumes:
-    - redis:/data
-    tmpfs:
-    - /tmp
-    - /var/run
-    - /run
-  init:
-    read_only: true
-    #userns_mode: keep-id
-    user: ${UID:-1000}
-    build:
-      context: ./containers/${NODE_IMG:-node16-runtime}
-    image: ${NODE_IMG:-node16-runtime}
-    env_file:
-    - local.env
-    volumes:
-    - .:/app/code
-    command: ["/bin/sh", "-c", "mkdir -p ~/; [ -d ./node_modules ] && echo '** node_modules exists' || npm install"]
-    tmpfs:
-    - /tmp
-    - /run
-  task:
-    extends:
-        service: init
-    command: ["npm", "run", "cli", "--", "task"]
-    links:
-    - redis
-    depends_on:
-    - redis
-  web:
-    extends:
-        service: init
-    command: ["npm", "run", "cli", "--", "web"]
-    ports:
-    - ${WEB_LISTEN_PORT:-3000}:3000
-    depends_on:
-    - redis
-    links:
-    - mongo
-

examples/nodeproj/example.env

@@ -1,3 +0,0 @@
-WEB_LISTEN_PORT=3000
-# pass UID= your IDE user
-

examples/nodeproj/example.local.env

@@ -1,2 +0,0 @@
-REDIS_HOST=redis
-

examples/nodeproj/index.js

@@ -1,6 +0,0 @@
-#! /usr/bin/env node
-"use strict";
-import {start} from "./lib";
-
-start();
-

examples/nodeproj/jsconfig.json

@@ -1,14 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es2020",
-        "module": "es2020",
-        "moduleResolution": "node",
-        "allowSyntheticDefaultImports": true
-    },
-    "files": [
-        "index.js"
-    ],
-    "include": [
-        "lib/**/*.js"
-    ]
-}

examples/nodeproj/lib/commands/task.js

@@ -1,31 +0,0 @@
-"use strict";
-import {proj} from "../proj";
-
-async function loop() {
-    const poped = await proj.predis.blpop("queue", 5);
-    const task_desc_s = poped[1];
-    let task_desc;
-    try {
-        task_desc = JSON.parse(task_desc_s);
-    } catch (e) {
-        console.exception(e);
-    }
-    console.info("got task "+task_desc.func);
-    const func = task_desc.func;
-    const args = task_desc.args;
-    if (typeof(proj.tasks[func])!="function") {
-        console.log(`task ${func} not found`);
-        process.exit(-1)
-    }
-    try {
-        await ((this.tasks[func])(...args));
-    } catch (e) {
-        console.exception(e);
-    }
-}
-
-export async function start() {
-    while(true) {
-        loop();
-    }
-}

examples/nodeproj/lib/commands/web.js

@@ -1,21 +0,0 @@
-"use strict";
-import {proj} from "../proj";
-
-import http from "http";
-import express from "express";
-
-
-export async function start() {
-    const app = express();
-    const server = http.createServer(app);
-
-    // Routing
-    app.use(express.static(proj.config.basedir + "/public"));
-    app.get("/healthz", function(req, res) {
-        res.send("ok@"+Date.now());
-    });
-
-    server.listen(proj.config.LISTEN_PORT, proj.config.LISTEN_HOST, function() {
-        console.warn(`listening at port ${proj.config.LISTEN_PORT}`);
-    });
-}

examples/nodeproj/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "nodeproj",
-  "version": "0.0.1",
-  "description": "nodejs example project",
-  "exports": {
-    ".": "./index.js",
-    "./lib": "./lib"
-  },
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "cli": "nodemon -w lib -w index.js --es-module-specifier-resolution=node ./index.js"
-  },
-  "dependencies": {
-    "express": "~4.16.4",
-    "redis": "^3.1.2"
-  },
-  "private": true,
-  "author": "",
-  "license": "proprietary",
-  "devDependencies": {
-    "nodemon": "^2.0.14"
-  }
-}

examples/nodeproj/public/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Vote</title>
-<link rel="stylesheet" href="https://unpkg.com/browse/normalize.css@8.0.1/normalize.css">
-<link rel="stylesheet" href="styles.css">
-</head>
-<body>
-<h1>This is a Heading</h1>
-<p>This is a paragraph.</p>
-</body>
-<script type="text/javascript" src="main.css"></script>
-<script type="text/javascript">
-//<![CDATA[
-console.log("loaded");
-//]]>
-</script>
-</html>

examples/wordpress/docker-compose.yaml

@@ -1,24 +0,0 @@
----
-volumes:
-  db_data:
-services:
-  wordpress:
-    image: docker.io/library/wordpress:latest
-    ports:
-      - 8080:80
-    environment:
-      - WORDPRESS_DB_HOST=db
-      - WORDPRESS_DB_USER=wordpress
-      - WORDPRESS_DB_PASSWORD=password
-      - WORDPRESS_DB_NAME=wordpress
-  db:
-    image: docker.io/library/mariadb:10.6.4-focal
-    command: '--default-authentication-plugin=mysql_native_password'
-    volumes:
-      - db_data:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=somewordpress
-      - MYSQL_DATABASE=wordpress
-      - MYSQL_USER=wordpress
-      - MYSQL_PASSWORD=password
-

pytests/test_can_merge_build.py

@@ -1,168 +0,0 @@
-import copy
-import os
-import argparse
-import yaml
-from podman_compose import normalize_service, PodmanCompose
-
-
-test_cases_simple = [
-    ({"test": "test"}, {"test": "test"}),
-    ({"build": "."}, {"build": {"context": "."}}),
-    ({"build": "./dir-1"}, {"build": {"context": "./dir-1"}}),
-    ({"build": {"context": "./dir-1"}}, {"build": {"context": "./dir-1"}}),
-    (
-        {"build": {"dockerfile": "dockerfile-1"}},
-        {"build": {"dockerfile": "dockerfile-1"}},
-    ),
-    (
-        {"build": {"context": "./dir-1", "dockerfile": "dockerfile-1"}},
-        {"build": {"context": "./dir-1", "dockerfile": "dockerfile-1"}},
-    ),
-]
-
-
-def test_normalize_service_simple():
-    for test_case, expected in copy.deepcopy(test_cases_simple):
-        test_original = copy.deepcopy(test_case)
-        test_case = normalize_service(test_case)
-        test_result = expected == test_case
-        if not test_result:
-            print("test:     ", test_original)
-            print("expected: ", expected)
-            print("actual:   ", test_case)
-        assert test_result
-
-
-test_cases_sub_dir = [
-    ({"test": "test"}, {"test": "test"}),
-    ({"build": "."}, {"build": {"context": "./sub_dir/."}}),
-    ({"build": "./dir-1"}, {"build": {"context": "./sub_dir/dir-1"}}),
-    ({"build": {"context": "./dir-1"}}, {"build": {"context": "./sub_dir/dir-1"}}),
-    (
-        {"build": {"dockerfile": "dockerfile-1"}},
-        {"build": {"context": "./sub_dir", "dockerfile": "dockerfile-1"}},
-    ),
-    (
-        {"build": {"context": "./dir-1", "dockerfile": "dockerfile-1"}},
-        {"build": {"context": "./sub_dir/dir-1", "dockerfile": "dockerfile-1"}},
-    ),
-]
-
-
-def test_normalize_service_with_sub_dir():
-    for test_case, expected in copy.deepcopy(test_cases_sub_dir):
-        test_original = copy.deepcopy(test_case)
-        test_case = normalize_service(test_case, sub_dir="./sub_dir")
-        test_result = expected == test_case
-        if not test_result:
-            print("test:     ", test_original)
-            print("expected: ", expected)
-            print("actual:   ", test_case)
-        assert test_result
-
-
-test_cases_merges = [
-    ({}, {}, {}),
-    ({}, {"test": "test"}, {"test": "test"}),
-    ({"test": "test"}, {}, {"test": "test"}),
-    ({"test": "test-1"}, {"test": "test-2"}, {"test": "test-2"}),
-    ({}, {"build": "."}, {"build": {"context": "."}}),
-    ({"build": "."}, {}, {"build": {"context": "."}}),
-    ({"build": "./dir-1"}, {"build": "./dir-2"}, {"build": {"context": "./dir-2"}}),
-    ({}, {"build": {"context": "./dir-1"}}, {"build": {"context": "./dir-1"}}),
-    ({"build": {"context": "./dir-1"}}, {}, {"build": {"context": "./dir-1"}}),
-    (
-        {"build": {"context": "./dir-1"}},
-        {"build": {"context": "./dir-2"}},
-        {"build": {"context": "./dir-2"}},
-    ),
-    (
-        {},
-        {"build": {"dockerfile": "dockerfile-1"}},
-        {"build": {"dockerfile": "dockerfile-1"}},
-    ),
-    (
-        {"build": {"dockerfile": "dockerfile-1"}},
-        {},
-        {"build": {"dockerfile": "dockerfile-1"}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-1"}},
-        {"build": {"dockerfile": "./dockerfile-2"}},
-        {"build": {"dockerfile": "./dockerfile-2"}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-1"}},
-        {"build": {"context": "./dir-2"}},
-        {"build": {"dockerfile": "./dockerfile-1", "context": "./dir-2"}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-1", "context": "./dir-1"}},
-        {"build": {"dockerfile": "./dockerfile-2", "context": "./dir-2"}},
-        {"build": {"dockerfile": "./dockerfile-2", "context": "./dir-2"}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-1"}},
-        {"build": {"dockerfile": "./dockerfile-2", "args": ["ENV1=1"]}},
-        {"build": {"dockerfile": "./dockerfile-2", "args": ["ENV1=1"]}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-2", "args": ["ENV1=1"]}},
-        {"build": {"dockerfile": "./dockerfile-1"}},
-        {"build": {"dockerfile": "./dockerfile-1", "args": ["ENV1=1"]}},
-    ),
-    (
-        {"build": {"dockerfile": "./dockerfile-2", "args": ["ENV1=1"]}},
-        {"build": {"dockerfile": "./dockerfile-1", "args": ["ENV2=2"]}},
-        {"build": {"dockerfile": "./dockerfile-1", "args": ["ENV1=1", "ENV2=2"]}},
-    ),
-]
-
-
-def test__parse_compose_file_when_multiple_composes() -> None:
-    for test_input, test_override, expected_result in copy.deepcopy(test_cases_merges):
-        compose_test_1 = {"services": {"test-service": test_input}}
-        compose_test_2 = {"services": {"test-service": test_override}}
-        dump_yaml(compose_test_1, "test-compose-1.yaml")
-        dump_yaml(compose_test_2, "test-compose-2.yaml")
-
-        podman_compose = PodmanCompose()
-        set_args(podman_compose, ["test-compose-1.yaml", "test-compose-2.yaml"])
-
-        podman_compose._parse_compose_file()  # pylint: disable=protected-access
-
-        actual_compose = {}
-        if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
-        if actual_compose != expected_result:
-            print("compose:   ", test_input)
-            print("override:  ", test_override)
-            print("expected:  ", expected_result)
-            print("actual:    ", actual_compose)
-
-        compose_expected = expected_result
-
-        assert compose_expected == actual_compose
-
-
-def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
-    podman_compose.global_args = argparse.Namespace()
-    podman_compose.global_args.file = file_names
-    podman_compose.global_args.project_name = None
-    podman_compose.global_args.env_file = None
-    podman_compose.global_args.profile = []
-    podman_compose.global_args.in_pod = True
-    podman_compose.global_args.no_normalize = True
-
-
-def dump_yaml(compose: dict, name: str) -> None:
-    with open(name, "w", encoding="utf-8") as outfile:
-        yaml.safe_dump(compose, outfile, default_flow_style=False)
-
-
-def test_clean_test_yamls() -> None:
-    test_files = ["test-compose-1.yaml", "test-compose-2.yaml"]
-    for file in test_files:
-        if os.path.exists(file):
-            os.remove(file)

pytests/test_can_merge_cmd_ent.py

@@ -1,122 +0,0 @@
-import copy
-import os
-import argparse
-import yaml
-from podman_compose import normalize_service, PodmanCompose
-
-test_keys = ["command", "entrypoint"]
-
-test_cases_normalise_pre_merge = [
-    ({"$$$": []}, {"$$$": []}),
-    ({"$$$": ["sh"]}, {"$$$": ["sh"]}),
-    ({"$$$": ["sh", "-c", "date"]}, {"$$$": ["sh", "-c", "date"]}),
-    ({"$$$": "sh"}, {"$$$": ["sh"]}),
-    ({"$$$": "sleep infinity"}, {"$$$": ["sleep", "infinity"]}),
-    (
-        {"$$$": "bash -c 'sleep infinity'"},
-        {"$$$": ["bash", "-c", "sleep infinity"]},
-    ),
-]
-
-test_cases_merges = [
-    ({}, {"$$$": []}, {"$$$": []}),
-    ({"$$$": []}, {}, {"$$$": []}),
-    ({"$$$": []}, {"$$$": "sh-2"}, {"$$$": ["sh-2"]}),
-    ({"$$$": "sh-2"}, {"$$$": []}, {"$$$": []}),
-    ({}, {"$$$": "sh"}, {"$$$": ["sh"]}),
-    ({"$$$": "sh"}, {}, {"$$$": ["sh"]}),
-    ({"$$$": "sh-1"}, {"$$$": "sh-2"}, {"$$$": ["sh-2"]}),
-    ({"$$$": ["sh-1"]}, {"$$$": "sh-2"}, {"$$$": ["sh-2"]}),
-    ({"$$$": "sh-1"}, {"$$$": ["sh-2"]}, {"$$$": ["sh-2"]}),
-    ({"$$$": "sh-1"}, {"$$$": ["sh-2", "sh-3"]}, {"$$$": ["sh-2", "sh-3"]}),
-    ({"$$$": ["sh-1"]}, {"$$$": ["sh-2", "sh-3"]}, {"$$$": ["sh-2", "sh-3"]}),
-    ({"$$$": ["sh-1", "sh-2"]}, {"$$$": ["sh-3", "sh-4"]}, {"$$$": ["sh-3", "sh-4"]}),
-    ({}, {"$$$": ["sh-3", "sh      4"]}, {"$$$": ["sh-3", "sh      4"]}),
-    ({"$$$": "sleep infinity"}, {"$$$": "sh"}, {"$$$": ["sh"]}),
-    ({"$$$": "sh"}, {"$$$": "sleep infinity"}, {"$$$": ["sleep", "infinity"]}),
-    (
-        {},
-        {"$$$": "bash -c 'sleep infinity'"},
-        {"$$$": ["bash", "-c", "sleep infinity"]},
-    ),
-]
-
-
-def template_to_expression(base, override, expected, key):
-    base_copy = copy.deepcopy(base)
-    override_copy = copy.deepcopy(override)
-    expected_copy = copy.deepcopy(expected)
-
-    expected_copy[key] = expected_copy.pop("$$$")
-    if "$$$" in base:
-        base_copy[key] = base_copy.pop("$$$")
-    if "$$$" in override:
-        override_copy[key] = override_copy.pop("$$$")
-    return base_copy, override_copy, expected_copy
-
-
-def test_normalize_service():
-    for test_input_template, expected_template in test_cases_normalise_pre_merge:
-        for key in test_keys:
-            test_input, _, expected = template_to_expression(
-                test_input_template, {}, expected_template, key
-            )
-            test_input = normalize_service(test_input)
-            test_result = expected == test_input
-            if not test_result:
-                print("base_template:     ", test_input_template)
-                print("expected:          ", expected)
-                print("actual:            ", test_input)
-            assert test_result
-
-
-def test__parse_compose_file_when_multiple_composes() -> None:
-    for base_template, override_template, expected_template in copy.deepcopy(
-        test_cases_merges
-    ):
-        for key in test_keys:
-            base, override, expected = template_to_expression(
-                base_template, override_template, expected_template, key
-            )
-            compose_test_1 = {"services": {"test-service": base}}
-            compose_test_2 = {"services": {"test-service": override}}
-            dump_yaml(compose_test_1, "test-compose-1.yaml")
-            dump_yaml(compose_test_2, "test-compose-2.yaml")
-
-            podman_compose = PodmanCompose()
-            set_args(podman_compose, ["test-compose-1.yaml", "test-compose-2.yaml"])
-
-            podman_compose._parse_compose_file()  # pylint: disable=protected-access
-
-            actual = {}
-            if podman_compose.services:
-                podman_compose.services["test-service"].pop("_deps")
-                actual = podman_compose.services["test-service"]
-            if actual != expected:
-                print("compose:   ", base)
-                print("override:  ", override)
-                print("result:    ", expected)
-
-            assert expected == actual
-
-
-def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
-    podman_compose.global_args = argparse.Namespace()
-    podman_compose.global_args.file = file_names
-    podman_compose.global_args.project_name = None
-    podman_compose.global_args.env_file = None
-    podman_compose.global_args.profile = []
-    podman_compose.global_args.in_pod = True
-    podman_compose.global_args.no_normalize = None
-
-
-def dump_yaml(compose: dict, name: str) -> None:
-    with open(name, "w", encoding="utf-8") as outfile:
-        yaml.safe_dump(compose, outfile, default_flow_style=False)
-
-
-def test_clean_test_yamls() -> None:
-    test_files = ["test-compose-1.yaml", "test-compose-2.yaml"]
-    for file in test_files:
-        if os.path.exists(file):
-            os.remove(file)

pytests/test_normalize_final_build.py

@@ -1,298 +0,0 @@
-# pylint: disable=protected-access
-
-import argparse
-import copy
-import os
-import yaml
-from podman_compose import (
-    normalize_service,
-    normalize,
-    normalize_final,
-    normalize_service_final,
-    PodmanCompose,
-)
-
-cwd = os.path.abspath(".")
-test_cases_simple_normalization = [
-    ({"image": "test-image"}, {"image": "test-image"}),
-    (
-        {"build": "."},
-        {
-            "build": {"context": cwd, "dockerfile": "Dockerfile"},
-        },
-    ),
-    (
-        {"build": "../relative"},
-        {
-            "build": {
-                "context": os.path.normpath(os.path.join(cwd, "../relative")),
-                "dockerfile": "Dockerfile",
-            },
-        },
-    ),
-    (
-        {"build": "./relative"},
-        {
-            "build": {
-                "context": os.path.normpath(os.path.join(cwd, "./relative")),
-                "dockerfile": "Dockerfile",
-            },
-        },
-    ),
-    (
-        {"build": "/workspace/absolute"},
-        {
-            "build": {
-                "context": "/workspace/absolute",
-                "dockerfile": "Dockerfile",
-            },
-        },
-    ),
-    (
-        {
-            "build": {
-                "dockerfile": "Dockerfile",
-            },
-        },
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "Dockerfile",
-            },
-        },
-    ),
-    (
-        {
-            "build": {
-                "context": ".",
-            },
-        },
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "Dockerfile",
-            },
-        },
-    ),
-    (
-        {
-            "build": {"context": "../", "dockerfile": "test-dockerfile"},
-        },
-        {
-            "build": {
-                "context": os.path.normpath(os.path.join(cwd, "../")),
-                "dockerfile": "test-dockerfile",
-            },
-        },
-    ),
-    (
-        {
-            "build": {"context": ".", "dockerfile": "./dev/test-dockerfile"},
-        },
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "./dev/test-dockerfile",
-            },
-        },
-    ),
-]
-
-
-#
-# [service.build] is normalised after merges
-#
-def test_normalize_service_final_returns_absolute_path_in_context() -> None:
-    project_dir = cwd
-    for test_input, expected_service in copy.deepcopy(test_cases_simple_normalization):
-        actual_service = normalize_service_final(test_input, project_dir)
-        assert expected_service == actual_service
-
-
-def test_normalize_returns_absolute_path_in_context() -> None:
-    project_dir = cwd
-    for test_input, expected_result in copy.deepcopy(test_cases_simple_normalization):
-        compose_test = {"services": {"test-service": test_input}}
-        compose_expected = {"services": {"test-service": expected_result}}
-        actual_compose = normalize_final(compose_test, project_dir)
-        assert compose_expected == actual_compose
-
-
-#
-# running full parse over single compose files
-#
-def test__parse_compose_file_when_single_compose() -> None:
-    for test_input, expected_result in copy.deepcopy(test_cases_simple_normalization):
-        compose_test = {"services": {"test-service": test_input}}
-        dump_yaml(compose_test, "test-compose.yaml")
-
-        podman_compose = PodmanCompose()
-        set_args(podman_compose, ["test-compose.yaml"], no_normalize=None)
-
-        podman_compose._parse_compose_file()
-
-        actual_compose = {}
-        if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
-        if actual_compose != expected_result:
-            print("compose:   ", test_input)
-            print("result:    ", expected_result)
-
-        assert expected_result == actual_compose
-
-
-test_cases_with_merges = [
-    (
-        {},
-        {"build": "."},
-        {"build": {"context": cwd, "dockerfile": "Dockerfile"}},
-    ),
-    (
-        {"build": "."},
-        {},
-        {"build": {"context": cwd, "dockerfile": "Dockerfile"}},
-    ),
-    (
-        {"build": "/workspace/absolute"},
-        {"build": "./relative"},
-        {
-            "build": {
-                "context": os.path.normpath(os.path.join(cwd, "./relative")),
-                "dockerfile": "Dockerfile",
-            }
-        },
-    ),
-    (
-        {"build": "./relative"},
-        {"build": "/workspace/absolute"},
-        {"build": {"context": "/workspace/absolute", "dockerfile": "Dockerfile"}},
-    ),
-    (
-        {"build": "./relative"},
-        {"build": "/workspace/absolute"},
-        {"build": {"context": "/workspace/absolute", "dockerfile": "Dockerfile"}},
-    ),
-    (
-        {"build": {"dockerfile": "test-dockerfile"}},
-        {},
-        {"build": {"context": cwd, "dockerfile": "test-dockerfile"}},
-    ),
-    (
-        {},
-        {"build": {"dockerfile": "test-dockerfile"}},
-        {"build": {"context": cwd, "dockerfile": "test-dockerfile"}},
-    ),
-    (
-        {},
-        {"build": {"dockerfile": "test-dockerfile"}},
-        {"build": {"context": cwd, "dockerfile": "test-dockerfile"}},
-    ),
-    (
-        {"build": {"dockerfile": "test-dockerfile-1"}},
-        {"build": {"dockerfile": "test-dockerfile-2"}},
-        {"build": {"context": cwd, "dockerfile": "test-dockerfile-2"}},
-    ),
-    (
-        {"build": "/workspace/absolute"},
-        {"build": {"dockerfile": "test-dockerfile"}},
-        {"build": {"context": "/workspace/absolute", "dockerfile": "test-dockerfile"}},
-    ),
-    (
-        {"build": {"dockerfile": "test-dockerfile"}},
-        {"build": "/workspace/absolute"},
-        {"build": {"context": "/workspace/absolute", "dockerfile": "test-dockerfile"}},
-    ),
-    (
-        {"build": {"dockerfile": "./test-dockerfile-1"}},
-        {"build": {"dockerfile": "./test-dockerfile-2", "args": ["ENV1=1"]}},
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "./test-dockerfile-2",
-                "args": ["ENV1=1"],
-            }
-        },
-    ),
-    (
-        {"build": {"dockerfile": "./test-dockerfile-1", "args": ["ENV1=1"]}},
-        {"build": {"dockerfile": "./test-dockerfile-2"}},
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "./test-dockerfile-2",
-                "args": ["ENV1=1"],
-            }
-        },
-    ),
-    (
-        {"build": {"dockerfile": "./test-dockerfile-1", "args": ["ENV1=1"]}},
-        {"build": {"dockerfile": "./test-dockerfile-2", "args": ["ENV2=2"]}},
-        {
-            "build": {
-                "context": cwd,
-                "dockerfile": "./test-dockerfile-2",
-                "args": ["ENV1=1", "ENV2=2"],
-            }
-        },
-    ),
-]
-
-
-#
-# running full parse over merged
-#
-def test__parse_compose_file_when_multiple_composes() -> None:
-    for test_input, test_override, expected_result in copy.deepcopy(
-        test_cases_with_merges
-    ):
-        compose_test_1 = {"services": {"test-service": test_input}}
-        compose_test_2 = {"services": {"test-service": test_override}}
-        dump_yaml(compose_test_1, "test-compose-1.yaml")
-        dump_yaml(compose_test_2, "test-compose-2.yaml")
-
-        podman_compose = PodmanCompose()
-        set_args(
-            podman_compose,
-            ["test-compose-1.yaml", "test-compose-2.yaml"],
-            no_normalize=None,
-        )
-
-        podman_compose._parse_compose_file()
-
-        actual_compose = {}
-        if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
-        if actual_compose != expected_result:
-            print("compose:   ", test_input)
-            print("override:  ", test_override)
-            print("result:    ", expected_result)
-        compose_expected = expected_result
-
-        assert compose_expected == actual_compose
-
-
-def set_args(
-    podman_compose: PodmanCompose, file_names: list[str], no_normalize: bool
-) -> None:
-    podman_compose.global_args = argparse.Namespace()
-    podman_compose.global_args.file = file_names
-    podman_compose.global_args.project_name = None
-    podman_compose.global_args.env_file = None
-    podman_compose.global_args.profile = []
-    podman_compose.global_args.in_pod = True
-    podman_compose.global_args.no_normalize = no_normalize
-
-
-def dump_yaml(compose: dict, name: str) -> None:
-    # Path(Path.cwd()/"subdirectory").mkdir(parents=True, exist_ok=True)
-    with open(name, "w", encoding="utf-8") as outfile:
-        yaml.safe_dump(compose, outfile, default_flow_style=False)
-
-
-def test_clean_test_yamls() -> None:
-    test_files = ["test-compose-1.yaml", "test-compose-2.yaml", "test-compose.yaml"]
-    for file in test_files:
-        if os.path.exists(file):
-            os.remove(file)

pytests/test_volumes.py

@@ -1,21 +0,0 @@
-# pylint: disable=redefined-outer-name
-import pytest
-
-from podman_compose import parse_short_mount
-
-
-@pytest.fixture
-def multi_propagation_mount_str():
-    return "/foo/bar:/baz:U,Z"
-
-
-def test_parse_short_mount_multi_propagation(multi_propagation_mount_str):
-    expected = {
-        "type": "bind",
-        "source": "/foo/bar",
-        "target": "/baz",
-        "bind": {
-            "propagation": "U,Z",
-        },
-    }
-    assert parse_short_mount(multi_propagation_mount_str, "/") == expected

setup.cfg

@@ -3,7 +3,3 @@ universal = 1
 
 [metadata]
 version = attr: podman_compose.__version__
-
-[flake8]
-# The GitHub editor is 127 chars wide
-max-line-length=127

setup.py

@@ -2,51 +2,43 @@ import os
 from setuptools import setup
 
 try:
-    README = open(
-        os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8"
-    ).read()
-except:  # noqa: E722 # pylint: disable=bare-except
-    README = ""
+    readme = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
+except:
+    readme = ''
 
 setup(
-    name="podman-compose",
+    name='podman-compose',
     description="A script to run docker-compose.yml using podman",
-    long_description=README,
-    long_description_content_type="text/markdown",
+    long_description=readme,
+    long_description_content_type='text/markdown',
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Development Status :: 3 - Alpha",
         "Topic :: Software Development :: Build Tools",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
-    keywords="podman, podman-compose",
-    author="Muayyad Alsadi",
-    author_email="alsadi@gmail.com",
-    url="https://github.com/containers/podman-compose",
-    py_modules=["podman_compose"],
-    entry_points={"console_scripts": ["podman-compose = podman_compose:main"]},
-    include_package_data=True,
-    license="GPL-2.0-only",
-    install_requires=[
-        "pyyaml",
-        "python-dotenv",
-    ],
-    extras_require={
-        "devel": [
-            "flake8",
-            "black",
-            "pylint",
-            "pre-commit",
+    keywords='podman, podman-compose',
+    author='Muayyad Alsadi',
+    author_email='alsadi@gmail.com',
+    url='https://github.com/containers/podman-compose',
+    py_modules=['podman_compose'],
+    entry_points={
+        'console_scripts': [
+            'podman-compose = podman_compose:main'
         ]
-    }
+    },
+    include_package_data=True,
+    license='GPL-2.0-only',
+    install_requires=[
+        'pyyaml',
+        'python-dotenv',
+    ],
     # test_suite='tests',
     # tests_require=[
     #     'coverage',

test-requirements.txt

@@ -6,4 +6,3 @@ coverage
 pytest-cov
 pytest
 tox
-black

tests/build_fail/README.md

@@ -1,22 +0,0 @@
-# Test podman-compose with build (fail scenario)
-
-```shell
-podman-compose build || echo $?
-```
-
-expected output would be something like
-
-```
-STEP 1/3: FROM busybox
-STEP 2/3: RUN this_command_does_not_exist
-/bin/sh: this_command_does_not_exist: not found
-Error: building at STEP "RUN this_command_does_not_exist": while running runtime: exit status 127
-
-exit code: 127
-```
-
-Expected `podman-compose` exit code:
-```shell
-echo $?
-127
-```

tests/build_fail/context/Dockerfile

@@ -1,3 +0,0 @@
-FROM busybox
-RUN this_command_does_not_exist
-CMD ["sh"]

tests/build_fail/docker-compose.yml

@@ -1,5 +0,0 @@
-version: "3"
-services:
-    test:
-      build: ./context
-      image: build-fail-img

tests/conftest.py

@@ -1,26 +0,0 @@
-"""conftest.py
-
-Defines global pytest fixtures available to all tests.
-"""
-# pylint: disable=redefined-outer-name
-from pathlib import Path
-import os
-import pytest
-
-
-@pytest.fixture
-def base_path():
-    """Returns the base path for the project"""
-    return Path(__file__).parent.parent
-
-
-@pytest.fixture
-def test_path(base_path):
-    """Returns the path to the tests directory"""
-    return os.path.join(base_path, "tests")
-
-
-@pytest.fixture
-def podman_compose_path(base_path):
-    """Returns the path to the podman compose script"""
-    return os.path.join(base_path, "podman_compose.py")

tests/env-file-tests/README.md

@@ -1,9 +0,0 @@
-running the following commands should always give podman-rocks-123
-
-```
-podman-compose -f project/container-compose.yaml --env-file env-files/project-1.env up
-```
-
-```
-podman-compose -f $(pwd)/project/container-compose.yaml --env-file $(pwd)/env-files/project-1.env up
-```

tests/env-file-tests/env-files/project-1.env

@@ -1 +0,0 @@
-ZZVAR1=podman-rocks-123

tests/env-file-tests/project/container-compose.yaml

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: busybox
-    command: ["/bin/busybox", "sh", "-c", "env | grep ZZ"]
-    tmpfs:
-      - /run
-      - /tmp
-    environment:
-      ZZVAR1: $ZZVAR1

tests/extends_w_empty_service/common-services.yml

@@ -1,7 +0,0 @@
-services:
-  webapp_default:
-
-  webapp_special:
-    image: busybox
-    volumes:
-      - "/data"

tests/extends_w_empty_service/docker-compose.yml

@@ -1,10 +0,0 @@
-version: "3"
-services:
-  web:
-    image: busybox
-    extends:
-      file: common-services.yml
-      service: webapp_default
-    environment:
-      - DEBUG=1
-    cpu_shares: 5

tests/extends_w_file_subdir/docker-compose.yml

@@ -1,8 +0,0 @@
-version: "3"
-services:
-  web:
-    extends:
-      file: sub/docker-compose.yml
-      service: webapp
-    environment:
-      - DEBUG=1

tests/extends_w_file_subdir/sub/docker-compose.yml

@@ -1,12 +0,0 @@
-version: "3"
-services:
-  webapp:
-    build:
-      context: docker/example
-      dockerfile: Dockerfile
-    image: localhost/subdir_test:me
-    ports:
-      - "8000:8000"
-    volumes:
-      - "/data"
-

tests/extends_w_file_subdir/sub/docker/example/Dockerfile

@@ -1 +0,0 @@
-FROM busybox as base

tests/include/docker-compose.base.yaml

@@ -1,7 +0,0 @@
-version: '3.6'
-
-services:
-  web:
-    image: busybox
-    command: ["/bin/busybox", "httpd", "-f", "-h", ".", "-p", "8003"]
-

tests/include/docker-compose.yaml

@@ -1,4 +0,0 @@
-version: '3.6'
-
-include:
-  - docker-compose.base.yaml

tests/multicompose/d1/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     image: busybox
     command: busybox httpd -h /var/www/html/ -f -p 8001
     volumes:
-      - ./1.env:/var/www/html/index.txt:z
+    - ./1.env:/var/www/html/index.txt
     env_file: ./1.env
     labels:
       l1: v1

tests/multicompose/d2/docker-compose.yml

@@ -1,11 +1,10 @@
 version: '3'
 services:
   web1:
-    image: busybox
     env_file: ./12.env
     labels:
-      - l1=v2
-      - l2=v2
+    - l1=v2
+    - l2=v2
     environment:
         mykey1: myval2
         mykey2: myval2
@@ -14,6 +13,6 @@ services:
     image: busybox
     command: busybox httpd -h /var/www/html/ -f -p 8002
     volumes:
-      - ./2.env:/var/www/html/index.txt:z
+    - ./2.env:/var/www/html/index.txt
     env_file: ./2.env
 

tests/nethost/docker-compose.yaml

@@ -1,7 +0,0 @@
-version: '3'
-services:
-  web:
-    image: busybox
-    command: httpd -f -p 8123 -h /etc/
-    network_mode: host
-

tests/netprio/docker-compose.yaml

@@ -1,16 +0,0 @@
----
-# https://github.com/compose-spec/compose-spec/blob/master/spec.md#priority
-services:
-  app:
-    image: busybox
-    command: top
-    networks:
-      app_net_1:
-      app_net_2:
-        priority: 1000
-      app_net_3:
-        priority: 100
-networks:
-  app_net_1:
-  app_net_2:
-  app_net_3:

tests/nets_test1/docker-compose.yml

@@ -1,21 +0,0 @@
-version: "3"
-services:
-    web1:
-      image: busybox
-      hostname: web1
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      ports:
-        - 8001:8001
-      volumes:
-        - ./test1.txt:/var/www/html/index.txt:ro,z
-    web2:
-      image: busybox
-      hostname: web2
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      ports:
-        - 8002:8001
-      volumes:
-        - ./test2.txt:/var/www/html/index.txt:ro,z
-

tests/nets_test1/test1.txt

@@ -1 +0,0 @@
-test1

tests/nets_test1/test2.txt

@@ -1 +0,0 @@
-test2

tests/nets_test2/docker-compose.yml

@@ -1,23 +0,0 @@
-version: "3"
-networks:
-    mystack:
-services:
-    web1:
-      image: busybox
-      hostname: web1
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      ports:
-        - 8001:8001
-      volumes:
-        - ./test1.txt:/var/www/html/index.txt:ro,z
-    web2:
-      image: busybox
-      hostname: web2
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      ports:
-        - 8002:8001
-      volumes:
-        - ./test2.txt:/var/www/html/index.txt:ro,z
-

tests/nets_test2/test1.txt

@@ -1 +0,0 @@
-test1

tests/nets_test2/test2.txt

@@ -1 +0,0 @@
-test2

tests/nets_test3/docker-compose.yml

@@ -1,45 +0,0 @@
-version: "3"
-networks:
-    net1:
-    net2:
-services:
-    web1:
-      image: busybox
-      #container_name: web1
-      hostname: web1
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      networks:
-      - net1
-      ports:
-        - 8001:8001
-      volumes:
-        - ./test1.txt:/var/www/html/index.txt:ro,z
-    web2:
-      image: busybox
-      #container_name: web2
-      hostname: web2
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      networks:
-      - net1
-      - net2
-      ports:
-        - 8002:8001
-      volumes:
-        - ./test2.txt:/var/www/html/index.txt:ro,z
-    web3:
-      image: busybox
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      working_dir: /var/www/html
-      networks:
-        net1:
-          aliases:
-          - alias11
-          - alias12
-        net2:
-          aliases:
-          - alias21
-      volumes:
-        - ./test2.txt:/var/www/html/index.txt:ro,z
-

tests/nets_test3/test1.txt

@@ -1 +0,0 @@
-test1

tests/nets_test3/test2.txt

@@ -1 +0,0 @@
-test2

tests/ports/docker-compose.yml

@@ -2,34 +2,32 @@ version: "3"
 services:
     web1:
       image: busybox
-      hostname: web1
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
       working_dir: /var/www/html
       ports:
-        - 8001:8001
+      - 8001:8001
       volumes:
-        - ./test1.txt:/var/www/html/index.txt:ro,z
+      - ./test1.txt:/var/www/html/index.txt:ro
     web2:
       image: busybox
-      hostname: web2
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
       working_dir: /var/www/html
       ports:
-        - 8002:8002
-        - target: 8003
-          host_ip: 127.0.0.1
-          published: 8003
-          protocol: udp
-        - target: 8004
-          host_ip: 127.0.0.1
-          published: 8004
-          protocol: tcp
-        - target: 8005
-          published: 8005
-        - target: 8006
-          protocol: udp
-        - target: 8007
-          host_ip: 127.0.0.1
+      - 8002:8002
+      - target: 8003
+        host_ip: 127.0.0.1
+        published: 8003
+        protocol: udp
+      - target: 8004
+        host_ip: 127.0.0.1
+        published: 8004
+        protocol: tcp
+      - target: 8005
+        published: 8005
+      - target: 8006
+        protocol: udp
+      - target: 8007
+        host_ip: 127.0.0.1
       volumes:
-        - ./test2.txt:/var/www/html/index.txt:ro,z
+      - ./test2.txt:/var/www/html/index.txt:ro
 

tests/profile/docker-compose.yml

@@ -1,24 +0,0 @@
-version: "3"
-services:
-    default-service:
-      image: busybox
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
-      tmpfs:
-        - /run
-        - /tmp
-    service-1:
-      image: busybox
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
-      tmpfs:
-        - /run
-        - /tmp
-      profiles:
-        - profile-1
-    service-2:
-      image: busybox
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
-      tmpfs:
-        - /run
-        - /tmp
-      profiles:
-        - profile-2

tests/secrets/docker-compose.yaml

@@ -1,7 +1,3 @@
----
-# echo "sec" | podman secret create my_secret -
-# echo "sec2" | podman secret create my_secret_2 -
-# echo "sec3" | podman secret create my_secret_3 -
 version: "3.8"
 services:
     test:
@@ -12,7 +8,7 @@ services:
         - /run
         - /tmp
       volumes:
-        - ./print_secrets.sh:/tmp/print_secrets.sh:z
+        - ./print_secrets.sh:/tmp/print_secrets.sh
       secrets:
         - my_secret
         - my_secret_2

tests/short/docker-compose.yaml

@@ -4,7 +4,7 @@ services:
       image: redis:alpine
       command: ["redis-server", "--appendonly yes", "--notify-keyspace-events", "Ex"]
       volumes:
-        - ./data/redis:/data:z
+        - ./data/redis:/data
       tmpfs: /run1
       ports:
         - "6379"
@@ -25,16 +25,16 @@ services:
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
       working_dir: /var/www/html
       volumes:
-        - ./data/web:/var/www/html:ro,z
+        - ./data/web:/var/www/html:ro
     web2:
       image: busybox
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
       working_dir: /var/www/html
       volumes:
-        - ~/Downloads/www:/var/www/html:ro,z
+        - ~/Downloads/www:/var/www/html:ro
     web3:
       image: busybox
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8003"]
       working_dir: /var/www/html
       volumes:
-        - /var/www/html:/var/www/html:ro,z
+        - /var/www/html:/var/www/html:ro

tests/test_podman_compose.py

@@ -1,84 +0,0 @@
-from pathlib import Path
-import subprocess
-
-
-def capture(command):
-    proc = subprocess.Popen(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    out, err = proc.communicate()
-    return out, err, proc.returncode
-
-
-def test_podman_compose_extends_w_file_subdir():
-    """
-    Test that podman-compose can execute podman-compose -f <file> up with extended File which
-    includes a build context
-    :return:
-    """
-    main_path = Path(__file__).parent.parent
-
-    command_up = [
-        "python3",
-        str(main_path.joinpath("podman_compose.py")),
-        "-f",
-        str(main_path.joinpath("tests", "extends_w_file_subdir", "docker-compose.yml")),
-        "up",
-        "-d",
-    ]
-
-    command_check_container = [
-        "podman",
-        "container",
-        "ps",
-        "--all",
-        "--format",
-        '"{{.Image}}"',
-    ]
-
-    command_down = [
-        "podman",
-        "rmi",
-        "--force",
-        "localhost/subdir_test:me",
-        "docker.io/library/busybox",
-    ]
-
-    out, _, returncode = capture(command_up)
-    assert 0 == returncode
-    # check container was created and exists
-    out, _, returncode = capture(command_check_container)
-    assert 0 == returncode
-    assert out == b'"localhost/subdir_test:me"\n'
-    out, _, returncode = capture(command_down)
-    # cleanup test image(tags)
-    assert 0 == returncode
-    # check container did not exists anymore
-    out, _, returncode = capture(command_check_container)
-    assert 0 == returncode
-    assert out == b""
-
-
-def test_podman_compose_extends_w_empty_service():
-    """
-    Test that podman-compose can execute podman-compose -f <file> up with extended File which
-    includes an empty service. (e.g. if the file is used as placeholder for more complex configurations.)
-    :return:
-    """
-    main_path = Path(__file__).parent.parent
-
-    command_up = [
-        "python3",
-        str(main_path.joinpath("podman_compose.py")),
-        "-f",
-        str(
-            main_path.joinpath("tests", "extends_w_empty_service", "docker-compose.yml")
-        ),
-        "up",
-        "-d",
-    ]
-
-    _, _, returncode = capture(command_up)
-    assert 0 == returncode

tests/test_podman_compose_config.py

@@ -1,78 +0,0 @@
-"""
-test_podman_compose_config.py
-
-Tests the podman-compose config command which is used to return defined compose services.
-"""
-# pylint: disable=redefined-outer-name
-import os
-from test_podman_compose import capture
-import pytest
-
-
-@pytest.fixture
-def profile_compose_file(test_path):
-    """ "Returns the path to the `profile` compose file used for this test module"""
-    return os.path.join(test_path, "profile", "docker-compose.yml")
-
-
-def test_config_no_profiles(podman_compose_path, profile_compose_file):
-    """
-    Tests podman-compose config command without profile enablement.
-
-    :param podman_compose_path: The fixture used to specify the path to the podman compose file.
-    :param profile_compose_file: The fixtued used to specify the path to the "profile" compose used in the test.
-    """
-    config_cmd = ["python3", podman_compose_path, "-f", profile_compose_file, "config"]
-
-    out, _, return_code = capture(config_cmd)
-    assert return_code == 0
-
-    string_output = out.decode("utf-8")
-    assert "default-service" in string_output
-    assert "service-1" not in string_output
-    assert "service-2" not in string_output
-
-
-@pytest.mark.parametrize(
-    "profiles, expected_services",
-    [
-        (
-            ["--profile", "profile-1", "config"],
-            {"default-service": True, "service-1": True, "service-2": False},
-        ),
-        (
-            ["--profile", "profile-2", "config"],
-            {"default-service": True, "service-1": False, "service-2": True},
-        ),
-        (
-            ["--profile", "profile-1", "--profile", "profile-2", "config"],
-            {"default-service": True, "service-1": True, "service-2": True},
-        ),
-    ],
-)
-def test_config_profiles(
-    podman_compose_path, profile_compose_file, profiles, expected_services
-):
-    """
-    Tests podman-compose
-    :param podman_compose_path: The fixture used to specify the path to the podman compose file.
-    :param profile_compose_file: The fixtued used to specify the path to the "profile" compose used in the test.
-    :param profiles: The enabled profiles for the parameterized test.
-    :param expected_services: Dictionary used to model the expected "enabled" services in the profile.
-        Key = service name, Value = True if the service is enabled, otherwise False.
-    """
-    config_cmd = ["python3", podman_compose_path, "-f", profile_compose_file]
-    config_cmd.extend(profiles)
-
-    out, _, return_code = capture(config_cmd)
-    assert return_code == 0
-
-    actual_output = out.decode("utf-8")
-
-    assert len(expected_services) == 3
-
-    actual_services = {}
-    for service, _ in expected_services.items():
-        actual_services[service] = service in actual_output
-
-    assert expected_services == actual_services

tests/test_podman_compose_include.py

@@ -1,71 +0,0 @@
-from pathlib import Path
-import subprocess
-
-
-def capture(command):
-    proc = subprocess.Popen(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    out, err = proc.communicate()
-    return out, err, proc.returncode
-
-
-def test_podman_compose_include():
-    """
-    Test that podman-compose can execute podman-compose -f <file> up with include
-    :return:
-    """
-    main_path = Path(__file__).parent.parent
-
-    command_up = [
-        "python3",
-        str(main_path.joinpath("podman_compose.py")),
-        "-f",
-        str(main_path.joinpath("tests", "include", "docker-compose.yaml")),
-        "up",
-        "-d",
-    ]
-
-    command_check_container = [
-        "podman",
-        "ps",
-        "-a",
-        "--filter",
-        "label=io.podman.compose.project=include",
-        "--format",
-        '"{{.Image}}"',
-    ]
-
-    command_container_id = [
-        "podman",
-        "ps",
-        "-a",
-        "--filter",
-        "label=io.podman.compose.project=include",
-        "--format",
-        '"{{.ID}}"',
-    ]
-
-    command_down = ["podman", "rm", "--force", "CONTAINER_ID"]
-
-    out, _, returncode = capture(command_up)
-    assert 0 == returncode
-    out, _, returncode = capture(command_check_container)
-    assert 0 == returncode
-    assert out == b'"docker.io/library/busybox:latest"\n'
-    # Get container ID to remove it
-    out, _, returncode = capture(command_container_id)
-    assert 0 == returncode
-    assert out != b""
-    container_id = out.decode().strip().replace('"', "")
-    command_down[3] = container_id
-    out, _, returncode = capture(command_down)
-    # cleanup test image(tags)
-    assert 0 == returncode
-    assert out != b""
-    # check container did not exists anymore
-    out, _, returncode = capture(command_check_container)
-    assert 0 == returncode
-    assert out == b""

tests/test_podman_compose_up_down.py

@@ -1,89 +0,0 @@
-"""
-test_podman_compose_up_down.py
-
-Tests the podman compose up and down commands used to create and remove services.
-"""
-# pylint: disable=redefined-outer-name
-import os
-from test_podman_compose import capture
-import pytest
-
-
-@pytest.fixture
-def profile_compose_file(test_path):
-    """ "Returns the path to the `profile` compose file used for this test module"""
-    return os.path.join(test_path, "profile", "docker-compose.yml")
-
-
-@pytest.fixture(autouse=True)
-def teardown(podman_compose_path, profile_compose_file):
-    """
-    Ensures that the services within the "profile compose file" are removed between each test case.
-
-    :param podman_compose_path: The path to the podman compose script.
-    :param profile_compose_file: The path to the compose file used for this test module.
-    """
-    # run the test case
-    yield
-
-    down_cmd = [
-        "python3",
-        podman_compose_path,
-        "--profile",
-        "profile-1",
-        "--profile",
-        "profile-2",
-        "-f",
-        profile_compose_file,
-        "down",
-    ]
-    capture(down_cmd)
-
-
-@pytest.mark.parametrize(
-    "profiles, expected_services",
-    [
-        (
-            ["--profile", "profile-1", "up", "-d"],
-            {"default-service": True, "service-1": True, "service-2": False},
-        ),
-        (
-            ["--profile", "profile-2", "up", "-d"],
-            {"default-service": True, "service-1": False, "service-2": True},
-        ),
-        (
-            ["--profile", "profile-1", "--profile", "profile-2", "up", "-d"],
-            {"default-service": True, "service-1": True, "service-2": True},
-        ),
-    ],
-)
-def test_up(podman_compose_path, profile_compose_file, profiles, expected_services):
-    up_cmd = [
-        "python3",
-        podman_compose_path,
-        "-f",
-        profile_compose_file,
-    ]
-    up_cmd.extend(profiles)
-
-    out, _, return_code = capture(up_cmd)
-    assert return_code == 0
-
-    check_cmd = [
-        "podman",
-        "container",
-        "ps",
-        "--format",
-        '"{{.Names}}"',
-    ]
-    out, _, return_code = capture(check_cmd)
-    assert return_code == 0
-
-    assert len(expected_services) == 3
-    actual_output = out.decode("utf-8")
-
-    actual_services = {}
-    for service, _ in expected_services.items():
-        actual_services[service] = service in actual_output
-
-    assert expected_services == actual_services

tests/testlogs/docker-compose.yml

@@ -1,9 +0,0 @@
-version: "3"
-services:
-    loop1:
-      image: busybox
-      command: ["/bin/sh", "-c", "for i in `seq 1 10000`; do echo \"loop1: $$i\"; sleep 1; done"]
-    loop2:
-      image: busybox
-      command: ["/bin/sh", "-c", "for i in `seq 1 10000`; do echo \"loop2: $$i\"; sleep 3; done"]
-

tests/uidmaps/docker-compose.yml

@@ -1,15 +0,0 @@
-version: "3.7"
-services:
-  touch:
-    image: busybox
-    command: 'touch /mnt/test'
-    volumes:
-      - ./:/mnt
-    user: 999:999
-    x-podman:
-      uidmaps:
-        - "0:1:1"
-        - "999:0:1"
-      gidmaps:
-        - "0:1:1"
-        - "999:0:1"

tests/vol/docker-compose.yaml

@@ -4,7 +4,6 @@ services:
       image: busybox
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8000"]
       working_dir: /var/www/html
-      restart: always
       volumes:
         - /var/www/html
       tmpfs:
@@ -13,10 +12,9 @@ services:
     web1:
       image: busybox
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
-      restart: unless-stopped
       working_dir: /var/www/html
       volumes:
-        - myvol1:/var/www/html:ro,z
+        - myvol1:/var/www/html:ro
     web2:
       image: busybox
       command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
@@ -34,7 +32,6 @@ services:
         - data3:/var/www/html_data3
 
 volumes:
-  myvol1:
   myvol2:
     labels:
       mylabel: myval

tests/volumes_merge/docker-compose.override.yaml

@@ -1,7 +0,0 @@
-version: "3"
-services:
-  web:
-    volumes:
-      - ./override.txt:/var/www/html/index.html:ro,z
-      - ./override.txt:/var/www/html/index2.html:z
-      - ./override.txt:/var/www/html/index3.html

tests/volumes_merge/docker-compose.yaml

@@ -1,11 +0,0 @@
-version: "3"
-services:
-  web:
-    image: busybox
-    command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8080"]
-    ports:
-      - 8080:8080
-    volumes:
-      - ./index.txt:/var/www/html/index.html:ro,z
-      - ./index.txt:/var/www/html/index2.html
-      - ./index.txt:/var/www/html/index3.html:ro

tests/volumes_merge/index.txt

@@ -1 +0,0 @@
-The file from docker-compose.yaml

tests/volumes_merge/override.txt

@@ -1 +0,0 @@
-The file from docker-compose.override.yaml