From 12f0e73fee4f8a0b9e91abbf4f23be9a1b6c4235 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Wed, 22 Nov 2023 10:31:40 +0100
Subject: [PATCH] Added requirements to setup and fixed docker file.
---
Dockerfile | 3 +--
setup.py | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1cc23d1..28ba476 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,11 @@ RUN apk add --update --no-cache gcc libc-dev libffi-dev curl vim bash openssh
RUN mkdir -p /app/gap/collections /app/gap/roles /etc/ansible && \
printf "[defaults]\ncollections_paths = /app/gap/collections\nroles_path = /app/gap/roles" > /etc/ansible/ansible.cfg
-RUN pip3 install \
+RUN pip install \
--pre \
--extra-index-url https://artifactory.software.geant.org/artifactory/api/pypi/geant-swd-pypi/simple \
--target /app \
goat-lso==${ARTIFACT_VERSION} && \
- pip3 install ncclient xmltodict junos-eznc jxmlease ansible ansible_merge_vars && \
ansible-galaxy collection install \
community.general \
juniper.device \
diff --git a/setup.py b/setup.py
index 708c309..e94066a 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,14 @@ setup(
"jmespath~=1.0.0",
"dictdiffer~=0.9.0",
"ansible-runner~=2.3.3",
+ "junos-eznc~=2.6.8",
+ "jxmlease~=1.0.3",
+ "ansible-core~=2.16.0",
+ "ansible_merge_vars~=5.0.0",
+ "httpx~=0.25.1",
+ "GitPython~=3.1.40",
+ "jinja2==3.1.2",
+ "ruamel.yaml~=0.18.5",
],
license="MIT",
license_files=("LICENSE.txt",),
--
GitLab