forked from extern/podman-compose
Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
9a8dc4ca17 | |||
6b5f62d693 | |||
3782b4ab84 | |||
95e07e27f0 | |||
a3123ce480 | |||
02f78dc3d7 | |||
8cd97682d0 | |||
85244272ff | |||
30cfe2317c | |||
7fda1cc835 | |||
5f40f4df31 | |||
d38aeaa713 | |||
17f9ca61bd | |||
80a47a13d5 | |||
872404c3a7 |
33
README.md
33
README.md
@ -1,13 +1,10 @@
|
||||
# Podman Compose
|
||||
|
||||
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 focus 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 depend on:
|
||||
|
||||
@ -18,16 +15,23 @@ This project only depend on:
|
||||
|
||||
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/minishift/).
|
||||
OpenShift/Kubernetes distribution like [OKD](https://www.okd.io/).
|
||||
|
||||
## Versions
|
||||
|
||||
@ -59,7 +63,7 @@ curl -o /usr/local/bin/podman-compose https://raw.githubusercontent.com/containe
|
||||
chmod +x /usr/local/bin/podman-compose
|
||||
```
|
||||
|
||||
or
|
||||
or inside your home
|
||||
|
||||
```
|
||||
curl -o ~/.local/bin/podman-compose https://raw.githubusercontent.com/containers/podman-compose/devel/podman_compose.py
|
||||
@ -103,11 +107,4 @@ When testing the `AWX3` example, if you got errors just wait for db migrations t
|
||||
Inside `tests/` directory we have many useless docker-compose stacks
|
||||
that are meant to test as much cases as we can to make sure we are compatible
|
||||
|
||||
## How it works
|
||||
|
||||
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).
|
||||
|
||||
If you are running as root, you might use identity mapping.
|
||||
|
||||
|
@ -1,37 +0,0 @@
|
||||
# AWX Compose
|
||||
|
||||
the directory roles is taken from [here](https://github.com/ansible/awx/tree/17.1.0/installer/roles/local_docker)
|
||||
|
||||
also look at https://github.com/ansible/awx/tree/17.1.0/tools/docker-compose
|
||||
|
||||
```
|
||||
mkdir deploy awx17
|
||||
ansible localhost \
|
||||
-e host_port=8080 \
|
||||
-e awx_secret_key='awx,secret.123' \
|
||||
-e secret_key='awx,secret.123' \
|
||||
-e admin_user='admin' \
|
||||
-e admin_password='admin' \
|
||||
-e pg_password='awx,123.' \
|
||||
-e pg_username='awx' \
|
||||
-e pg_database='awx' \
|
||||
-e pg_port='5432' \
|
||||
-e redis_image="docker.io/library/redis:6-alpine" \
|
||||
-e postgres_data_dir="./data/pg" \
|
||||
-e compose_start_containers=false \
|
||||
-e dockerhub_base='docker.io/ansible' \
|
||||
-e awx_image='docker.io/ansible/awx' \
|
||||
-e awx_version='17.1.0' \
|
||||
-e dockerhub_version='17.1.0' \
|
||||
-e docker_deploy_base_path=$PWD/deploy \
|
||||
-e docker_compose_dir=$PWD/awx17 \
|
||||
-e awx_task_hostname=awx \
|
||||
-e awx_web_hostname=awxweb \
|
||||
-m include_role -a name=local_docker
|
||||
cp awx17/docker-compose.yml awx17/docker-compose.yml.orig
|
||||
sed -i -re "s#- \"$PWD/awx17/(.*):/#- \"./\1:/#" awx17/docker-compose.yml
|
||||
cd awx17
|
||||
podman-compose run --rm --service-ports task awx-manage migrate --no-input
|
||||
podman-compose up -d
|
||||
```
|
||||
|
@ -1,11 +0,0 @@
|
||||
---
|
||||
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
|
||||
|
||||
awx_image: "awx"
|
||||
redis_image: "redis"
|
||||
|
||||
postgresql_version: "12"
|
||||
postgresql_image: "postgres:{{postgresql_version}}"
|
||||
|
||||
compose_start_containers: true
|
||||
upgrade_postgres: false
|
@ -1,74 +0,0 @@
|
||||
---
|
||||
- name: Create {{ docker_compose_dir }} directory
|
||||
file:
|
||||
path: "{{ docker_compose_dir }}"
|
||||
state: directory
|
||||
|
||||
- name: Create Redis socket directory
|
||||
file:
|
||||
path: "{{ docker_compose_dir }}/redis_socket"
|
||||
state: directory
|
||||
mode: 0777
|
||||
|
||||
- name: Create Docker Compose Configuration
|
||||
template:
|
||||
src: "{{ item.file }}.j2"
|
||||
dest: "{{ docker_compose_dir }}/{{ item.file }}"
|
||||
mode: "{{ item.mode }}"
|
||||
loop:
|
||||
- file: environment.sh
|
||||
mode: "0600"
|
||||
- file: credentials.py
|
||||
mode: "0600"
|
||||
- file: docker-compose.yml
|
||||
mode: "0600"
|
||||
- file: nginx.conf
|
||||
mode: "0600"
|
||||
- file: redis.conf
|
||||
mode: "0664"
|
||||
register: awx_compose_config
|
||||
|
||||
- name: Render SECRET_KEY file
|
||||
copy:
|
||||
content: "{{ secret_key }}"
|
||||
dest: "{{ docker_compose_dir }}/SECRET_KEY"
|
||||
mode: 0600
|
||||
register: awx_secret_key
|
||||
|
||||
- block:
|
||||
- name: Remove AWX containers before migrating postgres so that the old postgres container does not get used
|
||||
docker_compose:
|
||||
project_src: "{{ docker_compose_dir }}"
|
||||
state: absent
|
||||
ignore_errors: true
|
||||
|
||||
- name: Run migrations in task container
|
||||
shell: docker-compose run --rm --service-ports task awx-manage migrate --no-input
|
||||
args:
|
||||
chdir: "{{ docker_compose_dir }}"
|
||||
|
||||
- name: Start the containers
|
||||
docker_compose:
|
||||
project_src: "{{ docker_compose_dir }}"
|
||||
restarted: "{{ awx_compose_config is changed or awx_secret_key is changed }}"
|
||||
register: awx_compose_start
|
||||
|
||||
- name: Update CA trust in awx_web container
|
||||
command: docker exec awx_web '/usr/bin/update-ca-trust'
|
||||
when: awx_compose_config.changed or awx_compose_start.changed
|
||||
|
||||
- name: Update CA trust in awx_task container
|
||||
command: docker exec awx_task '/usr/bin/update-ca-trust'
|
||||
when: awx_compose_config.changed or awx_compose_start.changed
|
||||
|
||||
- name: Wait for launch script to create user
|
||||
wait_for:
|
||||
timeout: 10
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Create Preload data
|
||||
command: docker exec awx_task bash -c "/usr/bin/awx-manage create_preload_data"
|
||||
when: create_preload_data|bool
|
||||
register: cdo
|
||||
changed_when: "'added' in cdo.stdout"
|
||||
when: compose_start_containers|bool
|
@ -1,15 +0,0 @@
|
||||
---
|
||||
- name: Generate broadcast websocket secret
|
||||
set_fact:
|
||||
broadcast_websocket_secret: "{{ lookup('password', '/dev/null length=128') }}"
|
||||
run_once: true
|
||||
no_log: true
|
||||
when: broadcast_websocket_secret is not defined
|
||||
|
||||
- import_tasks: upgrade_postgres.yml
|
||||
when:
|
||||
- postgres_data_dir is defined
|
||||
- pg_hostname is not defined
|
||||
|
||||
- import_tasks: set_image.yml
|
||||
- import_tasks: compose.yml
|
@ -1,46 +0,0 @@
|
||||
---
|
||||
- name: Manage AWX Container Images
|
||||
block:
|
||||
- name: Export Docker awx image if it isnt local and there isnt a registry defined
|
||||
docker_image:
|
||||
name: "{{ awx_image }}"
|
||||
tag: "{{ awx_version }}"
|
||||
archive_path: "{{ awx_local_base_config_path|default('/tmp') }}/{{ awx_image }}_{{ awx_version }}.tar"
|
||||
when: inventory_hostname != "localhost" and docker_registry is not defined
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Set docker base path
|
||||
set_fact:
|
||||
docker_deploy_base_path: "{{ awx_base_path|default('/tmp') }}/docker_deploy"
|
||||
when: ansible_connection != "local" and docker_registry is not defined
|
||||
|
||||
- name: Ensure directory exists
|
||||
file:
|
||||
path: "{{ docker_deploy_base_path }}"
|
||||
state: directory
|
||||
when: ansible_connection != "local" and docker_registry is not defined
|
||||
|
||||
- name: Copy awx image to docker execution
|
||||
copy:
|
||||
src: "{{ awx_local_base_config_path|default('/tmp') }}/{{ awx_image }}_{{ awx_version }}.tar"
|
||||
dest: "{{ docker_deploy_base_path }}/{{ awx_image }}_{{ awx_version }}.tar"
|
||||
when: ansible_connection != "local" and docker_registry is not defined
|
||||
|
||||
- name: Load awx image
|
||||
docker_image:
|
||||
name: "{{ awx_image }}"
|
||||
tag: "{{ awx_version }}"
|
||||
load_path: "{{ docker_deploy_base_path }}/{{ awx_image }}_{{ awx_version }}.tar"
|
||||
timeout: 300
|
||||
when: ansible_connection != "local" and docker_registry is not defined
|
||||
|
||||
- name: Set full image path for local install
|
||||
set_fact:
|
||||
awx_docker_actual_image: "{{ awx_image }}:{{ awx_version }}"
|
||||
when: docker_registry is not defined
|
||||
when: dockerhub_base is not defined
|
||||
|
||||
- name: Set DockerHub Image Paths
|
||||
set_fact:
|
||||
awx_docker_actual_image: "{{ dockerhub_base }}/awx:{{ dockerhub_version }}"
|
||||
when: dockerhub_base is defined
|
@ -1,64 +0,0 @@
|
||||
---
|
||||
|
||||
- name: Create {{ postgres_data_dir }} directory
|
||||
file:
|
||||
path: "{{ postgres_data_dir }}"
|
||||
state: directory
|
||||
|
||||
- name: Get full path of postgres data dir
|
||||
shell: "echo {{ postgres_data_dir }}"
|
||||
register: fq_postgres_data_dir
|
||||
|
||||
- name: Register temporary docker container
|
||||
set_fact:
|
||||
container_command: "docker run --rm -v '{{ fq_postgres_data_dir.stdout }}:/var/lib/postgresql' centos:8 bash -c "
|
||||
|
||||
- name: Check for existing Postgres data (run from inside the container for access to file)
|
||||
shell:
|
||||
cmd: |
|
||||
{{ container_command }} "[[ -f /var/lib/postgresql/10/data/PG_VERSION ]] && echo 'exists'"
|
||||
register: pg_version_file
|
||||
ignore_errors: true
|
||||
|
||||
- name: Record Postgres version
|
||||
shell: |
|
||||
{{ container_command }} "cat /var/lib/postgresql/10/data/PG_VERSION"
|
||||
register: old_pg_version
|
||||
when: pg_version_file is defined and pg_version_file.stdout == 'exists'
|
||||
|
||||
- name: Determine whether to upgrade postgres
|
||||
set_fact:
|
||||
upgrade_postgres: "{{ old_pg_version.stdout == '10' }}"
|
||||
when: old_pg_version.changed
|
||||
|
||||
- name: Set up new postgres paths pre-upgrade
|
||||
shell: |
|
||||
{{ container_command }} "mkdir -p /var/lib/postgresql/12/data/"
|
||||
when: upgrade_postgres | bool
|
||||
|
||||
- name: Stop AWX before upgrading postgres
|
||||
docker_compose:
|
||||
project_src: "{{ docker_compose_dir }}"
|
||||
stopped: true
|
||||
when: upgrade_postgres | bool
|
||||
|
||||
- name: Upgrade Postgres
|
||||
shell: |
|
||||
docker run --rm \
|
||||
-v {{ postgres_data_dir }}/10/data:/var/lib/postgresql/10/data \
|
||||
-v {{ postgres_data_dir }}/12/data:/var/lib/postgresql/12/data \
|
||||
-e PGUSER={{ pg_username }} -e POSTGRES_INITDB_ARGS="-U {{ pg_username }}" \
|
||||
tianon/postgres-upgrade:10-to-12 --username={{ pg_username }}
|
||||
when: upgrade_postgres | bool
|
||||
|
||||
- name: Copy old pg_hba.conf
|
||||
shell: |
|
||||
{{ container_command }} "cp /var/lib/postgresql/10/data/pg_hba.conf /var/lib/postgresql/12/data/pg_hba.conf"
|
||||
when: upgrade_postgres | bool
|
||||
|
||||
- name: Remove old data directory
|
||||
shell: |
|
||||
{{ container_command }} "rm -rf /var/lib/postgresql/10/data"
|
||||
when:
|
||||
- upgrade_postgres | bool
|
||||
- compose_start_containers|bool
|
@ -1,13 +0,0 @@
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ATOMIC_REQUESTS': True,
|
||||
'ENGINE': 'django.db.backends.postgresql',
|
||||
'NAME': "{{ pg_database }}",
|
||||
'USER': "{{ pg_username }}",
|
||||
'PASSWORD': "{{ pg_password }}",
|
||||
'HOST': "{{ pg_hostname | default('postgres') }}",
|
||||
'PORT': "{{ pg_port }}",
|
||||
}
|
||||
}
|
||||
|
||||
BROADCAST_WEBSOCKET_SECRET = "{{ broadcast_websocket_secret | b64encode }}"
|
@ -1,208 +0,0 @@
|
||||
#jinja2: lstrip_blocks: True
|
||||
version: '2'
|
||||
services:
|
||||
|
||||
web:
|
||||
image: {{ awx_docker_actual_image }}
|
||||
container_name: awx_web
|
||||
depends_on:
|
||||
- redis
|
||||
{% if pg_hostname is not defined %}
|
||||
- postgres
|
||||
{% endif %}
|
||||
{% if (host_port is defined) or (host_port_ssl is defined) %}
|
||||
ports:
|
||||
{% if (host_port_ssl is defined) and (ssl_certificate is defined) %}
|
||||
- "{{ host_port_ssl }}:8053"
|
||||
{% endif %}
|
||||
{% if host_port is defined %}
|
||||
- "{{ host_port }}:8052"
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
hostname: {{ awx_web_hostname }}
|
||||
user: root
|
||||
restart: unless-stopped
|
||||
{% if (awx_web_container_labels is defined) and (',' in awx_web_container_labels) %}
|
||||
{% set awx_web_container_labels_list = awx_web_container_labels.split(',') %}
|
||||
labels:
|
||||
{% for awx_web_container_label in awx_web_container_labels_list %}
|
||||
- {{ awx_web_container_label }}
|
||||
{% endfor %}
|
||||
{% elif awx_web_container_labels is defined %}
|
||||
labels:
|
||||
- {{ awx_web_container_labels }}
|
||||
{% endif %}
|
||||
volumes:
|
||||
- supervisor-socket:/var/run/supervisor
|
||||
- rsyslog-socket:/var/run/awx-rsyslog/
|
||||
- rsyslog-config:/var/lib/awx/rsyslog/
|
||||
- "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
|
||||
- "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
|
||||
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
|
||||
- "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
{% if project_data_dir is defined %}
|
||||
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
|
||||
{% endif %}
|
||||
{% if custom_venv_dir is defined %}
|
||||
- "{{ custom_venv_dir +':'+ custom_venv_dir +':rw' }}"
|
||||
{% endif %}
|
||||
{% if ca_trust_dir is defined %}
|
||||
- "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}"
|
||||
{% endif %}
|
||||
{% if (ssl_certificate is defined) and (ssl_certificate_key is defined) %}
|
||||
- "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}"
|
||||
- "{{ ssl_certificate_key +':/etc/nginx/awxweb_key.pem:ro' }}"
|
||||
{% elif (ssl_certificate is defined) and (ssl_certificate_key is not defined) %}
|
||||
- "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}"
|
||||
{% endif %}
|
||||
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %}
|
||||
{% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
|
||||
dns_search:
|
||||
{% for awx_container_search_domain in awx_container_search_domains_list %}
|
||||
- {{ awx_container_search_domain }}
|
||||
{% endfor %}
|
||||
{% elif awx_container_search_domains is defined %}
|
||||
dns_search: "{{ awx_container_search_domains }}"
|
||||
{% endif %}
|
||||
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
|
||||
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
|
||||
dns:
|
||||
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
|
||||
- {{ awx_alternate_dns_server }}
|
||||
{% endfor %}
|
||||
{% elif awx_alternate_dns_servers is defined %}
|
||||
dns: "{{ awx_alternate_dns_servers }}"
|
||||
{% endif %}
|
||||
{% if (docker_compose_extra_hosts is defined) and (':' in docker_compose_extra_hosts) %}
|
||||
{% set docker_compose_extra_hosts_list = docker_compose_extra_hosts.split(',') %}
|
||||
extra_hosts:
|
||||
{% for docker_compose_extra_host in docker_compose_extra_hosts_list %}
|
||||
- "{{ docker_compose_extra_host }}"
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
environment:
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
no_proxy: {{ no_proxy | default('') }}
|
||||
{% if docker_logger is defined %}
|
||||
logging:
|
||||
driver: {{ docker_logger }}
|
||||
{% endif %}
|
||||
|
||||
task:
|
||||
image: {{ awx_docker_actual_image }}
|
||||
container_name: awx_task
|
||||
depends_on:
|
||||
- redis
|
||||
- web
|
||||
{% if pg_hostname is not defined %}
|
||||
- postgres
|
||||
{% endif %}
|
||||
command: /usr/bin/launch_awx_task.sh
|
||||
hostname: {{ awx_task_hostname }}
|
||||
user: root
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- supervisor-socket:/var/run/supervisor
|
||||
- rsyslog-socket:/var/run/awx-rsyslog/
|
||||
- rsyslog-config:/var/lib/awx/rsyslog/
|
||||
- "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
|
||||
- "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
|
||||
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
{% if project_data_dir is defined %}
|
||||
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
|
||||
{% endif %}
|
||||
{% if custom_venv_dir is defined %}
|
||||
- "{{ custom_venv_dir +':'+ custom_venv_dir +':rw' }}"
|
||||
{% endif %}
|
||||
{% if ca_trust_dir is defined %}
|
||||
- "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}"
|
||||
{% endif %}
|
||||
{% if ssl_certificate is defined %}
|
||||
- "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}"
|
||||
{% endif %}
|
||||
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %}
|
||||
{% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
|
||||
dns_search:
|
||||
{% for awx_container_search_domain in awx_container_search_domains_list %}
|
||||
- {{ awx_container_search_domain }}
|
||||
{% endfor %}
|
||||
{% elif awx_container_search_domains is defined %}
|
||||
dns_search: "{{ awx_container_search_domains }}"
|
||||
{% endif %}
|
||||
{% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) %}
|
||||
{% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
|
||||
dns:
|
||||
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
|
||||
- {{ awx_alternate_dns_server }}
|
||||
{% endfor %}
|
||||
{% elif awx_alternate_dns_servers is defined %}
|
||||
dns: "{{ awx_alternate_dns_servers }}"
|
||||
{% endif %}
|
||||
{% if (docker_compose_extra_hosts is defined) and (':' in docker_compose_extra_hosts) %}
|
||||
{% set docker_compose_extra_hosts_list = docker_compose_extra_hosts.split(',') %}
|
||||
extra_hosts:
|
||||
{% for docker_compose_extra_host in docker_compose_extra_hosts_list %}
|
||||
- "{{ docker_compose_extra_host }}"
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
environment:
|
||||
AWX_SKIP_MIGRATIONS: "1"
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
no_proxy: {{ no_proxy | default('') }}
|
||||
SUPERVISOR_WEB_CONFIG_PATH: '/etc/supervisord.conf'
|
||||
|
||||
redis:
|
||||
image: {{ redis_image }}
|
||||
container_name: awx_redis
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
no_proxy: {{ no_proxy | default('') }}
|
||||
command: ["/usr/local/etc/redis/redis.conf"]
|
||||
volumes:
|
||||
- "{{ docker_compose_dir }}/redis.conf:/usr/local/etc/redis/redis.conf:ro"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
{% if docker_logger is defined %}
|
||||
logging:
|
||||
driver: {{ docker_logger }}
|
||||
{% endif %}
|
||||
|
||||
{% if pg_hostname is not defined %}
|
||||
postgres:
|
||||
image: {{ postgresql_image }}
|
||||
container_name: awx_postgres
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- "{{ postgres_data_dir }}/12/data/:/var/lib/postgresql/data:Z"
|
||||
environment:
|
||||
POSTGRES_USER: {{ pg_username }}
|
||||
POSTGRES_PASSWORD: {{ pg_password }}
|
||||
POSTGRES_DB: {{ pg_database }}
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
no_proxy: {{ no_proxy | default('') }}
|
||||
{% if docker_logger is defined %}
|
||||
logging:
|
||||
driver: {{ docker_logger }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if docker_compose_subnet is defined %}
|
||||
networks:
|
||||
default:
|
||||
driver: bridge
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: {{ docker_compose_subnet }}
|
||||
{% endif %}
|
||||
|
||||
volumes:
|
||||
supervisor-socket:
|
||||
rsyslog-socket:
|
||||
rsyslog-config:
|
@ -1,10 +0,0 @@
|
||||
DATABASE_USER={{ pg_username|quote }}
|
||||
DATABASE_NAME={{ pg_database|quote }}
|
||||
DATABASE_HOST={{ pg_hostname|default('postgres')|quote }}
|
||||
DATABASE_PORT={{ pg_port|default('5432')|quote }}
|
||||
DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }}
|
||||
{% if pg_admin_password is defined %}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
|
||||
{% endif %}
|
||||
AWX_ADMIN_USER={{ admin_user|quote }}
|
||||
AWX_ADMIN_PASSWORD={{ admin_password|quote }}
|
@ -1,122 +0,0 @@
|
||||
#user awx;
|
||||
|
||||
worker_processes 1;
|
||||
|
||||
pid /tmp/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
server_tokens off;
|
||||
|
||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||
|
||||
access_log /dev/stdout main;
|
||||
|
||||
map $http_upgrade $connection_upgrade {
|
||||
default upgrade;
|
||||
'' close;
|
||||
}
|
||||
|
||||
sendfile on;
|
||||
#tcp_nopush on;
|
||||
#gzip on;
|
||||
|
||||
upstream uwsgi {
|
||||
server 127.0.0.1:8050;
|
||||
}
|
||||
|
||||
upstream daphne {
|
||||
server 127.0.0.1:8051;
|
||||
}
|
||||
|
||||
{% if ssl_certificate is defined %}
|
||||
server {
|
||||
listen 8052 default_server;
|
||||
server_name _;
|
||||
|
||||
# Redirect all HTTP links to the matching HTTPS page
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
{%endif %}
|
||||
|
||||
server {
|
||||
{% if (ssl_certificate is defined) and (ssl_certificate_key is defined) %}
|
||||
listen 8053 ssl;
|
||||
|
||||
ssl_certificate /etc/nginx/awxweb.pem;
|
||||
ssl_certificate_key /etc/nginx/awxweb_key.pem;
|
||||
{% elif (ssl_certificate is defined) and (ssl_certificate_key is not defined) %}
|
||||
listen 8053 ssl;
|
||||
|
||||
ssl_certificate /etc/nginx/awxweb.pem;
|
||||
ssl_certificate_key /etc/nginx/awxweb.pem;
|
||||
{% else %}
|
||||
listen 8052 default_server;
|
||||
{% endif %}
|
||||
|
||||
# If you have a domain name, this is where to add it
|
||||
server_name _;
|
||||
keepalive_timeout 65;
|
||||
|
||||
# HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
|
||||
add_header Strict-Transport-Security max-age=15768000;
|
||||
|
||||
# Protect against click-jacking https://www.owasp.org/index.php/Testing_for_Clickjacking_(OTG-CLIENT-009)
|
||||
add_header X-Frame-Options "DENY";
|
||||
|
||||
location /nginx_status {
|
||||
stub_status on;
|
||||
access_log off;
|
||||
allow 127.0.0.1;
|
||||
deny all;
|
||||
}
|
||||
|
||||
location /static/ {
|
||||
alias /var/lib/awx/public/static/;
|
||||
}
|
||||
|
||||
location /favicon.ico { alias /var/lib/awx/public/static/favicon.ico; }
|
||||
|
||||
location /websocket {
|
||||
# Pass request to the upstream alias
|
||||
proxy_pass http://daphne;
|
||||
# Require http version 1.1 to allow for upgrade requests
|
||||
proxy_http_version 1.1;
|
||||
# We want proxy_buffering off for proxying to websockets.
|
||||
proxy_buffering off;
|
||||
# http://en.wikipedia.org/wiki/X-Forwarded-For
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# enable this if you use HTTPS:
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
# pass the Host: header from the client for the sake of redirects
|
||||
proxy_set_header Host $http_host;
|
||||
# We've set the Host header, so we don't need Nginx to muddle
|
||||
# about with redirects
|
||||
proxy_redirect off;
|
||||
# Depending on the request value, set the Upgrade and
|
||||
# connection headers
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
}
|
||||
|
||||
location / {
|
||||
# Add trailing / if missing
|
||||
rewrite ^(.*)$http_host(.*[^/])$ $1$http_host$2/ permanent;
|
||||
uwsgi_read_timeout 120s;
|
||||
uwsgi_pass uwsgi;
|
||||
include /etc/nginx/uwsgi_params;
|
||||
{%- if extra_nginx_include is defined %}
|
||||
include {{ extra_nginx_include }};
|
||||
{%- endif %}
|
||||
proxy_set_header X-Forwarded-Port 443;
|
||||
uwsgi_param HTTP_X_FORWARDED_PORT 443;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
unixsocket /var/run/redis/redis.sock
|
||||
unixsocketperm 660
|
||||
port 0
|
||||
bind 127.0.0.1
|
@ -35,7 +35,7 @@ except ImportError:
|
||||
import yaml
|
||||
from dotenv import dotenv_values
|
||||
|
||||
__version__ = '0.1.11'
|
||||
__version__ = '1.0.2'
|
||||
|
||||
PY3 = sys.version_info[0] == 3
|
||||
if PY3:
|
||||
@ -68,7 +68,7 @@ def try_float(i, fallback=None):
|
||||
return fallback
|
||||
|
||||
dir_re = re.compile("^[~/\.]")
|
||||
propagation_re = re.compile("^(?:z|Z|O|U|r?shared|r?slave|r?private|r?unbindable|r?bind|(?:no)?(?:exec|dev|suid))$")
|
||||
propagation_re = re.compile("^(?:z|Z|r?shared|r?slave|r?private)$")
|
||||
norm_re = re.compile('[^-_a-z0-9]')
|
||||
num_split_re = re.compile(r'(\d+|\D+)')
|
||||
|
||||
@ -256,149 +256,21 @@ def norm_ulimit(inner_value):
|
||||
# if int or string return as is
|
||||
return inner_value
|
||||
|
||||
#def tr_identity(project_name, given_containers):
|
||||
# pod_name = f'pod_{project_name}'
|
||||
# pod = dict(name=pod_name)
|
||||
# containers = []
|
||||
# for cnt in given_containers:
|
||||
# containers.append(dict(cnt, pod=pod_name))
|
||||
# return [pod], containers
|
||||
|
||||
# transformation helpers
|
||||
|
||||
def adj_hosts(services, cnt, dst="127.0.0.1"):
|
||||
"""
|
||||
adjust container cnt in-place to add hosts pointing to dst for services
|
||||
"""
|
||||
common_extra_hosts = []
|
||||
for srv, cnts in services.items():
|
||||
common_extra_hosts.append("{}:{}".format(srv, dst))
|
||||
for cnt0 in cnts:
|
||||
common_extra_hosts.append("{}:{}".format(cnt0, dst))
|
||||
extra_hosts = list(cnt.get("extra_hosts", []))
|
||||
extra_hosts.extend(common_extra_hosts)
|
||||
# link aliases
|
||||
for link in cnt.get("links", []):
|
||||
a = link.strip().split(':', 1)
|
||||
if len(a) == 2:
|
||||
alias = a[1].strip()
|
||||
extra_hosts.append("{}:{}".format(alias, dst))
|
||||
cnt["extra_hosts"] = extra_hosts
|
||||
|
||||
|
||||
def move_list(dst, containers, key):
|
||||
"""
|
||||
move key (like port forwarding) from containers to dst (a pod or a infra container)
|
||||
"""
|
||||
a = set(dst.get(key, None) or [])
|
||||
for cnt in containers:
|
||||
a0 = cnt.get(key, None)
|
||||
if a0:
|
||||
a.update(a0)
|
||||
del cnt[key]
|
||||
if a:
|
||||
dst[key] = list(a)
|
||||
|
||||
|
||||
def move_port_fw(dst, containers):
|
||||
"""
|
||||
move port forwarding from containers to dst (a pod or a infra container)
|
||||
"""
|
||||
move_list(dst, containers, "ports")
|
||||
|
||||
|
||||
def move_extra_hosts(dst, containers):
|
||||
"""
|
||||
move port forwarding from containers to dst (a pod or a infra container)
|
||||
"""
|
||||
move_list(dst, containers, "extra_hosts")
|
||||
|
||||
|
||||
# transformations
|
||||
|
||||
transformations = {}
|
||||
|
||||
|
||||
def trans(func):
|
||||
transformations[func.__name__.replace("tr_", "")] = func
|
||||
return func
|
||||
|
||||
|
||||
@trans
|
||||
def tr_identity(project_name, services, given_containers):
|
||||
def tr_identity(project_name, given_containers):
|
||||
containers = []
|
||||
for cnt in given_containers:
|
||||
containers.append(dict(cnt))
|
||||
return [], containers
|
||||
|
||||
|
||||
@trans
|
||||
def tr_publishall(project_name, services, given_containers):
|
||||
containers = []
|
||||
for cnt0 in given_containers:
|
||||
cnt = dict(cnt0, publishall=True)
|
||||
# adjust hosts to point to the gateway, TODO: adjust host env
|
||||
adj_hosts(services, cnt, '10.0.2.2')
|
||||
containers.append(cnt)
|
||||
return [], containers
|
||||
|
||||
|
||||
@trans
|
||||
def tr_hostnet(project_name, services, given_containers):
|
||||
containers = []
|
||||
for cnt0 in given_containers:
|
||||
cnt = dict(cnt0, network_mode="host")
|
||||
# adjust hosts to point to localhost, TODO: adjust host env
|
||||
adj_hosts(services, cnt, '127.0.0.1')
|
||||
containers.append(cnt)
|
||||
return [], containers
|
||||
|
||||
|
||||
@trans
|
||||
def tr_cntnet(project_name, services, given_containers):
|
||||
containers = []
|
||||
infra_name = project_name + "_infra"
|
||||
infra = dict(
|
||||
name=infra_name,
|
||||
image="k8s.gcr.io/pause:3.1",
|
||||
_service=None,
|
||||
service_name=None
|
||||
)
|
||||
for cnt0 in given_containers:
|
||||
cnt = dict(cnt0, network_mode="container:"+infra_name)
|
||||
deps = cnt.get("depends_on", None) or []
|
||||
deps.append(infra_name)
|
||||
cnt["depends_on"] = deps
|
||||
# adjust hosts to point to localhost, TODO: adjust host env
|
||||
adj_hosts(services, cnt, '127.0.0.1')
|
||||
if "hostname" in cnt:
|
||||
del cnt["hostname"]
|
||||
containers.append(cnt)
|
||||
move_port_fw(infra, containers)
|
||||
move_extra_hosts(infra, containers)
|
||||
containers.insert(0, infra)
|
||||
return [], containers
|
||||
|
||||
|
||||
@trans
|
||||
def tr_1pod(project_name, services, given_containers):
|
||||
"""
|
||||
project_name:
|
||||
services: {service_name: ["container_name1", "..."]}, currently only one is supported
|
||||
given_containers: [{}, ...]
|
||||
"""
|
||||
pod = dict(name=project_name)
|
||||
containers = []
|
||||
for cnt0 in given_containers:
|
||||
cnt = dict(cnt0, pod=project_name)
|
||||
# services can be accessed as localhost because they are on one pod
|
||||
# adjust hosts to point to localhost, TODO: adjust host env
|
||||
adj_hosts(services, cnt, '127.0.0.1')
|
||||
containers.append(cnt)
|
||||
return [pod], containers
|
||||
|
||||
|
||||
@trans
|
||||
def tr_1podfw(project_name, services, given_containers):
|
||||
pods, containers = tr_1pod(project_name, services, given_containers)
|
||||
pod = pods[0]
|
||||
move_port_fw(pod, containers)
|
||||
return pods, containers
|
||||
|
||||
|
||||
def assert_volume(compose, mount_dict):
|
||||
"""
|
||||
inspect volume to get directory
|
||||
@ -506,13 +378,11 @@ def mount_desc_to_volume_args(compose, mount_desc, srv_name, cnt_name):
|
||||
# --volume, -v[=[[SOURCE-VOLUME|HOST-DIR:]CONTAINER-DIR[:OPTIONS]]]
|
||||
# [rw|ro]
|
||||
# [z|Z]
|
||||
# [[r]shared|[r]slave|[r]private]|[r]unbindable
|
||||
# [[r]shared|[r]slave|[r]private]
|
||||
# [[r]bind]
|
||||
# [noexec|exec]
|
||||
# [nodev|dev]
|
||||
# [nosuid|suid]
|
||||
# [O]
|
||||
# [U]
|
||||
read_only = mount_desc.get("read_only", None)
|
||||
if read_only is not None:
|
||||
opts.append('ro' if read_only else 'rw')
|
||||
@ -674,6 +544,47 @@ def norm_ports(ports_in):
|
||||
ports_out.append(port)
|
||||
return ports_out
|
||||
|
||||
def assert_cnt_nets(compose, cnt):
|
||||
"""
|
||||
create missing networks
|
||||
"""
|
||||
proj_name = compose.project_name
|
||||
nets = compose.networks
|
||||
default_net = compose.default_net
|
||||
cnt_nets = norm_as_list(cnt.get("networks", None) or default_net)
|
||||
for net in cnt_nets:
|
||||
net_desc = nets[net] or {}
|
||||
net_name = net_desc.get("name", None) or f"{proj_name}_{net}"
|
||||
print(f"podman network exists '{net_name}' || podman network create '{net_name}'")
|
||||
try: compose.podman.output([], "network", ["exists", net_name])
|
||||
except subprocess.CalledProcessError:
|
||||
args = [
|
||||
"create",
|
||||
"--label", "io.podman.compose.project={}".format(proj_name),
|
||||
"--label", "com.docker.compose.project={}".format(proj_name),
|
||||
]
|
||||
# TODO: add more options here, like driver, internal, ..etc
|
||||
labels = net_desc.get("labels", None) or []
|
||||
for item in norm_as_list(labels):
|
||||
args.extend(["--label", item])
|
||||
args.append(net_name)
|
||||
compose.podman.output([], "network", args)
|
||||
compose.podman.output([], "network", ["exists", net_name])
|
||||
|
||||
def get_net_args(compose, cnt):
|
||||
service_name = cnt["service_name"]
|
||||
project_name = compose.project_name
|
||||
default_net = compose.default_net
|
||||
nets = compose.networks
|
||||
cnt_nets = norm_as_list(cnt.get("networks", None) or default_net)
|
||||
net_names = set()
|
||||
for net in cnt_nets:
|
||||
net_desc = nets[net] or {}
|
||||
net_name = net_desc.get("name", None) or f"{project_name}_{net}"
|
||||
net_names.add(net_name)
|
||||
net_names_str = ",".join(net_names)
|
||||
return ["--net", net_names_str, "--network-alias", service_name]
|
||||
|
||||
def container_to_args(compose, cnt, detached=True):
|
||||
# TODO: double check -e , --add-host, -v, --read-only
|
||||
dirname = compose.dirname
|
||||
@ -720,6 +631,8 @@ def container_to_args(compose, cnt, detached=True):
|
||||
podman_args.extend(['--tmpfs', i])
|
||||
for volume in cnt.get('volumes', []):
|
||||
podman_args.extend(get_mount_args(compose, cnt, volume))
|
||||
assert_cnt_nets(compose, cnt)
|
||||
podman_args.extend(get_net_args(compose, cnt))
|
||||
log = cnt.get('logging')
|
||||
if log is not None:
|
||||
podman_args.append(f'--log-driver={log.get("driver", "k8s-file")}')
|
||||
@ -742,7 +655,7 @@ def container_to_args(compose, cnt, detached=True):
|
||||
elif not isinstance(port, str):
|
||||
raise TypeError("port should be either string or dict")
|
||||
podman_args.extend(['-p', port])
|
||||
|
||||
|
||||
user = cnt.get('user', None)
|
||||
if user is not None:
|
||||
podman_args.extend(['-u', user])
|
||||
@ -917,15 +830,11 @@ class Podman:
|
||||
return p
|
||||
|
||||
def volume_inspect_all(self):
|
||||
output = self.output([], "volume", ["inspect", "--all"]).decode('utf-8')
|
||||
output = self.output(["volume", "inspect", "--all"]).decode('utf-8')
|
||||
return json.loads(output)
|
||||
|
||||
def volume_inspect_proj(self, proj=None):
|
||||
if not proj:
|
||||
proj = self.compose.project_name
|
||||
volumes = [(vol.get("Labels", {}), vol) for vol in self.volume_inspect_all()]
|
||||
volumes = [(labels.get("io.podman.compose.project", None), vol) for labels, vol in volumes]
|
||||
return [vol for vol_proj, vol in volumes if vol_proj==proj]
|
||||
|
||||
def volume_rm(self, name):
|
||||
return self.run(["volume", "rm", name])
|
||||
|
||||
def normalize_service(service):
|
||||
for key in ("env_file", "security_opt", "volumes"):
|
||||
@ -1053,6 +962,8 @@ class PodmanCompose:
|
||||
self.pods = None
|
||||
self.containers = None
|
||||
self.vols = None
|
||||
self.networks = {}
|
||||
self.default_net = "default"
|
||||
self.declared_secrets = None
|
||||
self.container_names_by_service = None
|
||||
self.container_by_name = None
|
||||
@ -1125,7 +1036,6 @@ class PodmanCompose:
|
||||
no_ansi = args.no_ansi
|
||||
no_cleanup = args.no_cleanup
|
||||
dry_run = args.dry_run
|
||||
transform_policy = args.transform_policy
|
||||
host_env = None
|
||||
dirname = os.path.realpath(os.path.dirname(filename))
|
||||
dir_basename = os.path.basename(dirname)
|
||||
@ -1181,6 +1091,26 @@ class PodmanCompose:
|
||||
flat_deps(services)
|
||||
service_names = sorted([ (len(srv["_deps"]), name) for name, srv in services.items() ])
|
||||
service_names = [ name for _, name in service_names]
|
||||
nets = compose.get("networks", None) or {}
|
||||
if not nets:
|
||||
nets["default"] = None
|
||||
self.networks = nets
|
||||
if len(self.networks)==1:
|
||||
self.default_net = list(nets.keys())[0]
|
||||
elif "default" in nets:
|
||||
self.default_net = "default"
|
||||
else:
|
||||
self.default_net = None
|
||||
default_net = self.default_net
|
||||
allnets = set()
|
||||
for name, srv in services.items():
|
||||
srv_nets = norm_as_list(srv.get("networks", None) or default_net)
|
||||
allnets.update(srv_nets)
|
||||
given_nets = set(nets.keys())
|
||||
missing_nets = given_nets - allnets
|
||||
if len(missing_nets):
|
||||
missing_nets_str= ",".join(missing_nets)
|
||||
raise RuntimeError(f"missing networks: {missing_nets_str}")
|
||||
# volumes: [...]
|
||||
self.vols = compose.get('volumes', {})
|
||||
podman_compose_labels = [
|
||||
@ -1237,14 +1167,11 @@ class PodmanCompose:
|
||||
given_containers = list(container_by_name.values())
|
||||
given_containers.sort(key=lambda c: len(c.get('_deps', None) or []))
|
||||
#print("sorted:", [c["name"] for c in given_containers])
|
||||
tr = transformations[transform_policy]
|
||||
pods, containers = tr(
|
||||
project_name, container_names_by_service, given_containers)
|
||||
pods, containers = tr_identity(project_name, given_containers)
|
||||
self.pods = pods
|
||||
self.containers = containers
|
||||
self.container_by_name = dict([ (c["name"], c) for c in containers])
|
||||
|
||||
|
||||
def _parse_args(self):
|
||||
parser = argparse.ArgumentParser(
|
||||
formatter_class=argparse.RawTextHelpFormatter
|
||||
@ -1289,17 +1216,6 @@ class PodmanCompose:
|
||||
help="Do not stop and remove existing pod & containers", action='store_true')
|
||||
parser.add_argument("--dry-run",
|
||||
help="No action; perform a simulation of commands", action='store_true')
|
||||
parser.add_argument("-t", "--transform_policy",
|
||||
help=textwrap.dedent("""\
|
||||
how to translate docker compose to podman (default: 1podfw)
|
||||
1podfw - create all containers in one pod (inter-container communication is done via localhost), doing port mapping in that pod
|
||||
1pod - create all containers in one pod, doing port mapping in each container (does not work)
|
||||
identity - no mapping
|
||||
hostnet - use host network, and inter-container communication is done via host gateway and published ports
|
||||
cntnet - create a container and use it via --network container:name (inter-container communication via localhost)
|
||||
publishall - publish all ports to host (using -P) and communicate via gateway
|
||||
"""),
|
||||
choices=['1pod', '1podfw', 'hostnet', 'cntnet', 'publishall', 'identity'], default='1podfw')
|
||||
|
||||
podman_compose = PodmanCompose()
|
||||
|
||||
@ -1428,10 +1344,9 @@ def create_pods(compose, args):
|
||||
podman_args = [
|
||||
"create",
|
||||
"--name={}".format(pod["name"]),
|
||||
"--share", "net",
|
||||
]
|
||||
if compose.podman_version and not strverscmp_lt(compose.podman_version, "3.4.0"):
|
||||
podman_args.append("--infra-name={}_infra".format(pod["name"]))
|
||||
#if compose.podman_version and not strverscmp_lt(compose.podman_version, "3.4.0"):
|
||||
# podman_args.append("--infra-name={}_infra".format(pod["name"]))
|
||||
ports = pod.get("ports", None) or []
|
||||
if isinstance(ports, str):
|
||||
ports = [ports]
|
||||
@ -1471,8 +1386,7 @@ def compose_up(compose, args):
|
||||
|
||||
# TODO: implement check hash label for change
|
||||
if args.force_recreate:
|
||||
down_args = argparse.Namespace(**dict(args.__dict__, volumes=False))
|
||||
compose.commands['down'](compose, down_args)
|
||||
compose.commands['down'](compose, args)
|
||||
# args.no_recreate disables check for changes (which is not implemented)
|
||||
|
||||
podman_command = 'run' if args.detach and not args.no_start else 'create'
|
||||
@ -1538,9 +1452,11 @@ def compose_down(compose, args):
|
||||
for pod in compose.pods:
|
||||
compose.podman.run([], "pod", ["rm", pod["name"]], sleep=0)
|
||||
if args.volumes:
|
||||
volume_names = [vol["Name"] for vol in compose.podman.volume_inspect_proj()]
|
||||
for volume_name in volume_names:
|
||||
compose.podman.run([], "volume", ["rm", volume_name])
|
||||
volumes = compose.podman.volume_inspect_all()
|
||||
for volume in volumes:
|
||||
project = volume.get("Labels", {}).get("io.podman.compose.project")
|
||||
if project == compose.project_name:
|
||||
compose.podman.volume_rm(volume["Name"])
|
||||
|
||||
@cmd_run(podman_compose, 'ps', 'show status of containers')
|
||||
def compose_ps(compose, args):
|
||||
@ -1555,7 +1471,7 @@ def compose_run(compose, args):
|
||||
create_pods(compose, args)
|
||||
container_names=compose.container_names_by_service[args.service]
|
||||
container_name=container_names[0]
|
||||
cnt = dict(compose.container_by_name[container_name])
|
||||
cnt = compose.container_by_name[container_name]
|
||||
deps = cnt["_deps"]
|
||||
if not args.no_deps:
|
||||
up_args = argparse.Namespace(**dict(args.__dict__,
|
||||
@ -1586,9 +1502,6 @@ def compose_run(compose, args):
|
||||
cnt['tty']=False if args.T else True
|
||||
if args.cnt_command is not None and len(args.cnt_command) > 0:
|
||||
cnt['command']=args.cnt_command
|
||||
# can't restart and --rm
|
||||
if args.rm and 'restart' in cnt:
|
||||
del cnt['restart']
|
||||
# run podman
|
||||
podman_args = container_to_args(compose, cnt, args.detach)
|
||||
if not args.detach:
|
||||
|
@ -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
|
||||
- ./1.env:/var/www/html/index.txt:z
|
||||
env_file: ./1.env
|
||||
labels:
|
||||
l1: v1
|
||||
|
@ -1,10 +1,11 @@
|
||||
version: '3'
|
||||
services:
|
||||
web1:
|
||||
image: busybox
|
||||
env_file: ./12.env
|
||||
labels:
|
||||
- l1=v2
|
||||
- l2=v2
|
||||
- l1=v2
|
||||
- l2=v2
|
||||
environment:
|
||||
mykey1: myval2
|
||||
mykey2: myval2
|
||||
@ -13,6 +14,6 @@ services:
|
||||
image: busybox
|
||||
command: busybox httpd -h /var/www/html/ -f -p 8002
|
||||
volumes:
|
||||
- ./2.env:/var/www/html/index.txt
|
||||
- ./2.env:/var/www/html/index.txt:z
|
||||
env_file: ./2.env
|
||||
|
||||
|
21
tests/nets_test1/docker-compose.yml
Normal file
21
tests/nets_test1/docker-compose.yml
Normal file
@ -0,0 +1,21 @@
|
||||
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: web1
|
||||
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
|
||||
|
1
tests/nets_test1/test1.txt
Normal file
1
tests/nets_test1/test1.txt
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
tests/nets_test1/test2.txt
Normal file
1
tests/nets_test1/test2.txt
Normal file
@ -0,0 +1 @@
|
||||
test2
|
23
tests/nets_test2/docker-compose.yml
Normal file
23
tests/nets_test2/docker-compose.yml
Normal file
@ -0,0 +1,23 @@
|
||||
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
|
||||
|
1
tests/nets_test2/test1.txt
Normal file
1
tests/nets_test2/test1.txt
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
tests/nets_test2/test2.txt
Normal file
1
tests/nets_test2/test2.txt
Normal file
@ -0,0 +1 @@
|
||||
test2
|
31
tests/nets_test3/docker-compose.yml
Normal file
31
tests/nets_test3/docker-compose.yml
Normal file
@ -0,0 +1,31 @@
|
||||
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
|
||||
|
1
tests/nets_test3/test1.txt
Normal file
1
tests/nets_test3/test1.txt
Normal file
@ -0,0 +1 @@
|
||||
test1
|
1
tests/nets_test3/test2.txt
Normal file
1
tests/nets_test3/test2.txt
Normal file
@ -0,0 +1 @@
|
||||
test2
|
@ -2,32 +2,34 @@ 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
|
||||
- ./test1.txt:/var/www/html/index.txt:ro,z
|
||||
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
|
||||
- ./test2.txt:/var/www/html/index.txt:ro,z
|
||||
|
||||
|
@ -8,7 +8,7 @@ services:
|
||||
- /run
|
||||
- /tmp
|
||||
volumes:
|
||||
- ./print_secrets.sh:/tmp/print_secrets.sh
|
||||
- ./print_secrets.sh:/tmp/print_secrets.sh:z
|
||||
secrets:
|
||||
- my_secret
|
||||
- my_secret_2
|
||||
|
0
tests/short/data/redis/.keep
Normal file
0
tests/short/data/redis/.keep
Normal file
0
tests/short/data/web/.keep
Normal file
0
tests/short/data/web/.keep
Normal file
@ -4,7 +4,7 @@ services:
|
||||
image: redis:alpine
|
||||
command: ["redis-server", "--appendonly yes", "--notify-keyspace-events", "Ex"]
|
||||
volumes:
|
||||
- ./data/redis:/data
|
||||
- ./data/redis:/data:z
|
||||
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
|
||||
- ./data/web:/var/www/html:ro,z
|
||||
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
|
||||
- ~/Downloads/www:/var/www/html:ro,z
|
||||
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
|
||||
- /var/www/html:/var/www/html:ro,z
|
||||
|
@ -14,7 +14,7 @@ services:
|
||||
command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
|
||||
working_dir: /var/www/html
|
||||
volumes:
|
||||
- myvol1:/var/www/html:ro
|
||||
- myvol1:/var/www/html:ro,z
|
||||
web2:
|
||||
image: busybox
|
||||
command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
|
||||
|
Reference in New Issue
Block a user