#6 Fixing pyspiffe version

Author: telliere

client/container_preparation/Dockerfile

@@ -17,9 +17,6 @@ RUN wget -q https://github.com/spiffe/spire/releases/download/v1.9.1/spire-1.9.1
 RUN tar xvf spire-1.9.1-linux-amd64-musl.tar.gz ; mv spire-1.9.1 /opt ; mv /opt/spire-1.9.1 /opt/spire
 RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 
-# Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
-
 # Create code directory, output directory
 RUN mkdir /container_preparation /output ; chmod -R 777 /output
 

client/container_preparation/requirements.txt

@@ -8,4 +8,5 @@ pyrage==1.1.2
 pyyaml==5.3.1
 paramiko==3.4.0
 scp==0.14.5
+pyspiffe==0.0.1
 pre-commit

client/data_preparation/Dockerfile

@@ -19,9 +19,6 @@ RUN wget -q https://github.com/spiffe/spire/releases/download/v1.9.1/spire-1.9.1
 RUN tar xvf spire-1.9.1-linux-amd64-musl.tar.gz ; mv spire-1.9.1 /opt ; mv /opt/spire-1.9.1 /opt/spire
 RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 
-# Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
-
 # Create code directory, output directory
 RUN mkdir /data_preparation /output
 

client/data_preparation/requirements.txt

@@ -6,4 +6,5 @@ pyrage==1.1.2
 pyyaml==5.3.1
 paramiko==3.4.0
 scp==0.14.5
+pyspiffe==0.0.1
 pre-commit

server/Dockerfile

@@ -12,9 +12,6 @@ RUN tar xvf spire-1.9.0-linux-amd64-musl.tar.gz ; mv spire-1.9.0 /opt ; mv /opt/
 RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 RUN ln -s /opt/spire/bin/spire-server /usr/bin/spire-server
 
-# Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
-
 # Copy server
 RUN mkdir /server
 COPY ./server /server

server/requirements.txt

@@ -3,4 +3,5 @@ pyOpenSSL==24.0.0
 protobuf==3.20.0
 hvac==2.1.0
 quart==0.19.4
+pyspiffe==0.0.1
 pre-commit