From 470d54e686687c84b4fd1e0c3324f2ee67c9dbb9 Mon Sep 17 00:00:00 2001
From: DSTOLF <daniel.stolf@delphix.com>
Date: Wed, 23 Nov 2022 09:20:30 -0300
Subject: [PATCH] fixed python dependencies and openSuse Dockerfile

Fixed issues created by recently updated libs by creating a requirements.txt with the correct versions.

Also created an openSuse Dockerfile.
---
 docker/Centos7/Dockerfile     |  1 +
 docker/Centos7/entrypoint.sh  |  3 ++-
 docker/openSUSE/Dockerfile    | 27 +++++++++++++++++++++++++++
 docker/openSUSE/entrypoint.sh | 16 ++++++++++++++++
 dxm/lib/DxEngine/secret.py    |  2 +-
 requirements.txt              |  3 +++
 6 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 docker/openSUSE/Dockerfile
 create mode 100644 docker/openSUSE/entrypoint.sh
 create mode 100644 requirements.txt

diff --git a/docker/Centos7/Dockerfile b/docker/Centos7/Dockerfile
index bac9487..6020098 100644
--- a/docker/Centos7/Dockerfile
+++ b/docker/Centos7/Dockerfile
@@ -1,5 +1,6 @@
 FROM centos:7
 
+USER root
 RUN yum install -y python3 \
     && yum install -y python3-devel \
     && yum install -y git \ 
diff --git a/docker/Centos7/entrypoint.sh b/docker/Centos7/entrypoint.sh
index 5cb7b9d..7866877 100644
--- a/docker/Centos7/entrypoint.sh
+++ b/docker/Centos7/entrypoint.sh
@@ -6,7 +6,8 @@ cat secret.py.orig | sed -e "s/changemechangemechagemechangemec/${INPUT_ENCKEY}/
 
 
 cd /github/workspace/
-ls -l 
+ls -l
+pip3 install -r requirements.txt
 python3 setup.py install
 pyinstaller --onefile --clean dxmc.py
 cd /github/workspace/dist
diff --git a/docker/openSUSE/Dockerfile b/docker/openSUSE/Dockerfile
new file mode 100644
index 0000000..2757e07
--- /dev/null
+++ b/docker/openSUSE/Dockerfile
@@ -0,0 +1,27 @@
+FROM opensuse/leap:latest
+
+USER root
+RUN zypper in -y python3 \
+    && zypper in -y python3-devel \
+    && zypper in -y python3-pip \
+    && zypper in -y git \ 
+    && zypper in -y gcc \
+    && zypper in -y zlib-devel \
+    && zypper in -y openssl-devel \
+    && zypper in -y libffi-devel \
+    && zypper in -y libbz2-1 libbz2-devel
+
+ENV CFLAGS "-std=gnu99"
+
+RUN pip3 install wheel \
+    && pip3 install pyinstaller \
+    && pip3 install jeepney
+
+RUN mkdir -p /github/workspace
+RUN mkdir -p /github/home
+RUN mkdir -p /github/workflow
+COPY entrypoint.sh /entrypoint.sh
+WORKDIR /github/workspace
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/openSUSE/entrypoint.sh b/docker/openSUSE/entrypoint.sh
new file mode 100644
index 0000000..7866877
--- /dev/null
+++ b/docker/openSUSE/entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+cd /github/workspace/dxm/lib/DxEngine
+mv secret.py secret.py.orig
+cat secret.py.orig | sed -e "s/changemechangemechagemechangemec/${INPUT_ENCKEY}/" > secret.py
+
+
+cd /github/workspace/
+ls -l
+pip3 install -r requirements.txt
+python3 setup.py install
+pyinstaller --onefile --clean dxmc.py
+cd /github/workspace/dist
+
+
+
diff --git a/dxm/lib/DxEngine/secret.py b/dxm/lib/DxEngine/secret.py
index e15f4fc..45f665c 100644
--- a/dxm/lib/DxEngine/secret.py
+++ b/dxm/lib/DxEngine/secret.py
@@ -1,2 +1,2 @@
 # please change to value you want
-secret = b'changemechangemechagemechangemec'
\ No newline at end of file
+secret = b'changemechangemechagemechangemec'
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..b76c916
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+urllib3==1.26.12
+pyparsing==3.0.8
+idna==3.3