File tree Expand file tree Collapse file tree 4 files changed +9
-12
lines changed
.github/workflows/scripts Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -5,9 +5,9 @@ FROM {{ ci_base | default(pulp_default_container) }}
55ADD ./{{ item.name }} ./{{ item.name }}
66{% endfor %}
77
8- # Install python packages
9- # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads
10- # Hacking botocore (https://github.com/boto/botocore/pull/1990)
8+ {% for item in extra_files | default ([]) %}
9+ ADD ./{{ item.origin }} {{ item.destination }}
10+ {% endfor %}
1111
1212# This MUST be the ONLY call to pip install in inside the container.
1313RUN pip3 install --upgrade pip setuptools wheel && \
Original file line number Diff line number Diff line change @@ -62,6 +62,9 @@ VARSYAML
6262fi
6363
6464cat >> vars/main.yaml << VARSYAML
65+ extra_files:
66+ - origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf"
67+ destination: "/etc/nginx/pulp/api_root_rewrite.conf"
6568services:
6669 - name: pulp
6770 image: "pulp:ci_build"
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -21,6 +21,9 @@ deploy_to_pypi: true
2121disabled_redis_runners :
2222- s3
2323docker_fixtures : true
24+ extra_files :
25+ - origin : pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf
26+ destination : /etc/nginx/pulp/api_root_rewrite.conf
2427flake8 : true
2528flake8_ignore :
2629- ./pulpcore/app/protobuf/*
You can’t perform that action at this time.
0 commit comments