Skip to content

Commit bf5aaae

Browse files
committed
Move setup.py inside the package
Signed-off-by: chiragkyal <ckyal@redhat.com>
1 parent ba0b046 commit bf5aaae

5 files changed

Lines changed: 5 additions & 2 deletions

File tree

.goreleaser.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dockers:
4444
extra_files:
4545
- "images/ansible-operator/Pipfile"
4646
- "images/ansible-operator/Pipfile.lock"
47+
- "images/ansible-operator/ansible_runner_http"
4748
- image_templates:
4849
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
4950
dockerfile: images/ansible-operator/Dockerfile
@@ -58,6 +59,7 @@ dockers:
5859
extra_files:
5960
- "images/ansible-operator/Pipfile"
6061
- "images/ansible-operator/Pipfile.lock"
62+
- "images/ansible-operator/ansible_runner_http"
6163
- image_templates:
6264
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
6365
dockerfile: images/ansible-operator/Dockerfile
@@ -72,6 +74,7 @@ dockers:
7274
extra_files:
7375
- "images/ansible-operator/Pipfile"
7476
- "images/ansible-operator/Pipfile.lock"
77+
- "images/ansible-operator/ansible_runner_http"
7578
- image_templates:
7679
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
7780
dockerfile: images/ansible-operator/Dockerfile
@@ -86,6 +89,7 @@ dockers:
8689
extra_files:
8790
- "images/ansible-operator/Pipfile"
8891
- "images/ansible-operator/Pipfile.lock"
92+
- "images/ansible-operator/ansible_runner_http"
8993
docker_manifests:
9094
- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
9195
image_templates:

images/ansible-operator/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN rustc --version
1313
COPY images/ansible-operator/Pipfile* ./
1414
# Copy our local ansible-runner-http replacement module
1515
COPY images/ansible-operator/ansible_runner_http ./ansible_runner_http
16-
COPY images/ansible-operator/setup.py ./setup.py
1716
# Instruct pip(env) not to keep a cache of installed packages,
1817
# to install into the global site-packages and
1918
# to clear the pipenv cache as well
@@ -30,7 +29,7 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \
3029
&& pip3 install --upgrade pip~=23.3.2 \
3130
&& pip3 install pipenv==2023.11.15 \
3231
&& pipenv install --deploy \
33-
&& pip3 install . \
32+
&& pip3 install ansible_runner_http/ \
3433
&& pipenv check \
3534
&& dnf remove -y gcc libffi-devel openssl-devel python3.12-devel \
3635
&& dnf clean all \

images/ansible-operator/ansible_runner_http/__init__.py renamed to images/ansible-operator/ansible_runner_http/ansible_runner_http/__init__.py

File renamed without changes.

images/ansible-operator/ansible_runner_http/events.py renamed to images/ansible-operator/ansible_runner_http/ansible_runner_http/events.py

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)