Skip to content

Commit

Permalink
rm: Remove qa-ctl dockerfile qa-branch arg #1975
Browse files Browse the repository at this point in the history
It was not necessary, since a new docker image was built if the qa-branch was different
  • Loading branch information
jmv74211 committed Oct 4, 2021
1 parent 4ca2508 commit 38d2778
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
From ubuntu:focal

ARG qa_branch

ENV DEBIAN_FRONTEND=noninteractive
ENV RUNNING_ON_DOCKER_CONTAINER=true

Expand All @@ -14,7 +12,7 @@ RUN apt-get -q update && \
python3-pip \
python3-setuptools

ADD https://raw.githubusercontent.com/wazuh/wazuh-qa/$qa_branch/requirements.txt /tmp/requirements.txt
ADD https://raw.githubusercontent.com/wazuh/wazuh-qa/master/requirements.txt /tmp/requirements.txt
RUN python3 -m pip install --upgrade pip && python3 -m pip install -r /tmp/requirements.txt --ignore-installed

RUN mkdir /qa_ctl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def qa_ctl_docker_run(config_file, qa_branch, debug_level, topic):
'dockerfiles', 'qa_ctl')

LOGGER.info(f"Building docker image for {topic}")
run_local_command_with_output(f"cd {docker_image_path} && docker build -q -t {docker_image_name} "
f"--build-arg qa_branch={qa_branch} .")
run_local_command_with_output(f"cd {docker_image_path} && docker build -q -t {docker_image_name} .")

LOGGER.info(f"Running the Linux container for {topic}")
run_local_command(f"docker run --rm -v {gettempdir()}:/qa_ctl {docker_image_name} {docker_args}")

0 comments on commit 38d2778

Please sign in to comment.