From 17f9ca61bda7a95db4c1feb83bacd815d05a669a Mon Sep 17 00:00:00 2001 From: aanno Date: Wed, 24 Nov 2021 16:37:17 +0100 Subject: [PATCH] test fixes for SELinux (Fedora) --- tests/multicompose/d1/docker-compose.yml | 2 +- tests/multicompose/d2/docker-compose.yml | 7 +++-- tests/nets_test1/docker-compose.yml | 8 +++--- tests/nets_test2/docker-compose.yml | 8 +++--- tests/nets_test3/docker-compose.yml | 8 +++--- tests/ports/docker-compose.yml | 36 ++++++++++++------------ tests/secrets/docker-compose.yaml | 2 +- tests/short/data/redis/.keep | 0 tests/short/data/web/.keep | 0 tests/short/docker-compose.yaml | 8 +++--- tests/vol/docker-compose.yaml | 2 +- 11 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 tests/short/data/redis/.keep create mode 100644 tests/short/data/web/.keep diff --git a/tests/multicompose/d1/docker-compose.yml b/tests/multicompose/d1/docker-compose.yml index 6b787cf..d9d09eb 100644 --- a/tests/multicompose/d1/docker-compose.yml +++ b/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 + - ./1.env:/var/www/html/index.txt:z env_file: ./1.env labels: l1: v1 diff --git a/tests/multicompose/d2/docker-compose.yml b/tests/multicompose/d2/docker-compose.yml index d28a45c..a6358ad 100644 --- a/tests/multicompose/d2/docker-compose.yml +++ b/tests/multicompose/d2/docker-compose.yml @@ -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 diff --git a/tests/nets_test1/docker-compose.yml b/tests/nets_test1/docker-compose.yml index f3f391f..edc4557 100644 --- a/tests/nets_test1/docker-compose.yml +++ b/tests/nets_test1/docker-compose.yml @@ -6,16 +6,16 @@ services: 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: web1 command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"] working_dir: /var/www/html ports: - - 8002:8001 + - 8002:8001 volumes: - - ./test2.txt:/var/www/html/index.txt:ro + - ./test2.txt:/var/www/html/index.txt:ro,z diff --git a/tests/nets_test2/docker-compose.yml b/tests/nets_test2/docker-compose.yml index b06eb4d..aa24411 100644 --- a/tests/nets_test2/docker-compose.yml +++ b/tests/nets_test2/docker-compose.yml @@ -8,16 +8,16 @@ services: 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", "8001"] working_dir: /var/www/html ports: - - 8002:8001 + - 8002:8001 volumes: - - ./test2.txt:/var/www/html/index.txt:ro + - ./test2.txt:/var/www/html/index.txt:ro,z diff --git a/tests/nets_test3/docker-compose.yml b/tests/nets_test3/docker-compose.yml index 829435e..75847e0 100644 --- a/tests/nets_test3/docker-compose.yml +++ b/tests/nets_test3/docker-compose.yml @@ -12,9 +12,9 @@ services: networks: - net1 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 #container_name: web2 @@ -25,7 +25,7 @@ services: - net1 - net2 ports: - - 8002:8001 + - 8002:8001 volumes: - - ./test2.txt:/var/www/html/index.txt:ro + - ./test2.txt:/var/www/html/index.txt:ro,z diff --git a/tests/ports/docker-compose.yml b/tests/ports/docker-compose.yml index 7d0b812..68b2e4d 100644 --- a/tests/ports/docker-compose.yml +++ b/tests/ports/docker-compose.yml @@ -6,30 +6,30 @@ services: 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 diff --git a/tests/secrets/docker-compose.yaml b/tests/secrets/docker-compose.yaml index 4423dcb..e2b26a4 100644 --- a/tests/secrets/docker-compose.yaml +++ b/tests/secrets/docker-compose.yaml @@ -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 diff --git a/tests/short/data/redis/.keep b/tests/short/data/redis/.keep new file mode 100644 index 0000000..e69de29 diff --git a/tests/short/data/web/.keep b/tests/short/data/web/.keep new file mode 100644 index 0000000..e69de29 diff --git a/tests/short/docker-compose.yaml b/tests/short/docker-compose.yaml index fdbb342..fdfc5fe 100644 --- a/tests/short/docker-compose.yaml +++ b/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 + - ./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 diff --git a/tests/vol/docker-compose.yaml b/tests/vol/docker-compose.yaml index 34222cb..3005701 100644 --- a/tests/vol/docker-compose.yaml +++ b/tests/vol/docker-compose.yaml @@ -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"]