Fix handliong of multiple files in a transform

ssl-hep · Nov 16, 2022 · 60a8063 · 60a8063
1 parent 9aabf15
commit 60a8063
Show file tree

Hide file tree

Showing 6 changed files with 637 additions and 49 deletions.
diff --git a/code_generator_funcadl_xAOD/servicex/templates/transform_single_file.sh b/code_generator_funcadl_xAOD/servicex/templates/transform_single_file.sh
@@ -2,7 +2,7 @@
 set +e
 
 # If transformer has already run then we don't need to compile
-if [ ! -f /home/atlas/rel ]; then
+if [ ! -d /home/atlas/rel ]; then
   echo "Compile"
   bash /generated/runner.sh -c
   if [ $? != 0 ]; then

diff --git a/transformer_sidecar/Dockerfile b/transformer_sidecar/Dockerfile
@@ -1,19 +1,15 @@
-FROM ubuntu:18.04
+FROM python:3.10
 
 WORKDIR /servicex
 
-RUN apt-get update && \
-    apt-get install --reinstall -y build-essential \
-    -y python3-pip && \
-    ln -s /usr/bin/python3 /usr/bin/python
-
-COPY pyproject.toml pyproject.toml
-COPY poetry.lock poetry.lock
 RUN python3 -m pip install --upgrade pip
 
-ENV  POETRY_VERSION=1.2.1
+ENV  POETRY_VERSION=1.2.2
 RUN pip install poetry==$POETRY_VERSION
 
+COPY pyproject.toml pyproject.toml
+COPY poetry.lock poetry.lock
+
 RUN poetry config virtualenvs.create false && \
     poetry install --no-root --no-interaction --no-ansi