fixed image run issues

Author: Zalfsten

Dockerfile

@@ -25,7 +25,6 @@ RUN pip install --no-cache-dir -r requirements.txt --user
 # images for free. The older but stable python 3.11 is not available.
 FROM cgr.dev/chainguard/wolfi-base@sha256:e1d402d624011d0f4439bfb0d46a3ddc692465103c7234a326e0194953c3cfe0
 # Set the working directory in the container
-WORKDIR /middleware
 # copy python packages from builder stage
 COPY --from=builder /home/nonroot/.local /home/nonroot/.local
 # In in one step, so we do not create layers:
@@ -39,11 +38,12 @@ RUN apk add --no-cache \
         git=2.49.0-r1 \
         jq=1.8.1-r2 \
         openssh-client=10.0_p1-r0 && \
-    mkdir /middleware/output && \
+    mkdir -p /middleware/output && \
     chown nonroot:nonroot /middleware/output
 # Set the user to nonroot. It's defined in the Wolfi base image with the user id 65532
 # Copy the application from host
 COPY middleware/ /middleware/
+COPY config.yml /middleware/config.yml
 # We also copy the container-structure-test environment. This make it a lot easier to test the resulting container.
 COPY test/container-structure-test /middleware/test/container-structure-test
 COPY entrypoint.sh /entrypoint.sh
@@ -52,6 +52,6 @@ RUN chmod +x /entrypoint.sh
 USER nonroot
 ENTRYPOINT ["/entrypoint.sh"]
 # Set the command to run when the container starts
-CMD [ "python", "main.py", "-c", "config.yml" ]
+CMD ["python", "-m", "middleware.main", "-c", "/middleware/config.yml"]
 
 

config.yml

@@ -40,7 +40,7 @@ http_client:
 git:
   repo_url: git@github.com:fairagro/middleware_repo.git
   branch: main
-  local_path: output
+  local_path: /middleware/output
   user_name: "FAIRagro middleware"
   user_email: "middleware@fairagro.net"
 

middleware/git_repo/__init__.py

@@ -72,7 +72,7 @@ class GitRepo:
 
     def __init__(self, config: GitRepoConfig) -> None:
         self._config = config
-        self._ssh_tempdir = tempfile.TemporaryDirectory(dir='/tmp/ssh') # pylint: disable=R1732
+        self._ssh_tempdir = tempfile.TemporaryDirectory() # pylint: disable=R1732
         self._ssh_key = os.path.abspath(
             os.path.join(self._ssh_tempdir.name, "ssh_key"))
         self._ssh_authorized_keys = os.path.abspath(