fix: modify Dockerfiles to fix failing image builds (#180)

Signed-off-by: a3hadi <[email protected]>

Author: ayildirim21

examples/map/even_odd/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/map/even_odd"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/map/even_odd
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/map/even_odd /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/map/even_odd/pipeline.yaml

@@ -18,6 +18,7 @@ spec:
         - python
         - example.py
         image: quay.io/numaio/numaflow-python/even-odd:stable
+        imagePullPolicy: Always
   - name: even-sink
     scale:
       min: 1

examples/map/flatmap/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/map/flatmap"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/map/flatmap
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/map/even_odd /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/map/flatmap/pipeline.yaml

@@ -16,6 +16,7 @@ spec:
       udf:
         container:
           image: quay.io/numaio/numaflow-python/map-flatmap:stable
+          imagePullPolicy: Always
           env:
             - name: PYTHONDEBUG
               value: "true"

examples/map/forward_message/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/map/forward_message"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/map/forward_message
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/map/forward_message /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/map/forward_message/pipeline.yaml

@@ -18,6 +18,7 @@ spec:
         - python
         - example.py
         image: quay.io/numaio/numaflow-python/map-forward-message:stable
+        imagePullPolicy: Always
   - name: log-output
     sink:
       log: {}

examples/map/multiproc_map/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/map/multiproc_map"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/map/multiproc_map
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/map/multiproc_map /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/map/multiproc_map/pipeline.yaml

@@ -16,6 +16,7 @@ spec:
       udf:
         container:
           image: quay.io/numaio/numaflow-python/multiproc:stable
+          imagePullPolicy: Always
           env:
             - name: PYTHONDEBUG
               value: "true"

examples/mapstream/flatmap_stream/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/mapstream/flatmap_stream"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/mapstream/flatmap_stream
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/mapstream/flatmap_stream /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/reduce/asyncio_reduce/Dockerfile

@@ -51,4 +51,4 @@ RUN chmod +x entry.sh
 ENTRYPOINT ["/dumb-init", "--"]
 CMD ["/app/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/reduce/counter/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/reduce/counter"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/reduce/counter
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/reduce/counter /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/reduce/counter/pipeline.yaml

@@ -14,6 +14,7 @@ spec:
         container:
           # Tell the input number is even or odd, see https://github.com/numaproj/numaflow-go/tree/main/pkg/mapper/examples/even_odd
           image: quay.io/numaio/numaflow-go/map-even-odd:stable
+          imagePullPolicy: Always
     - name: compute-sum
       udf:
         container:

examples/reducestream/counter/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/reducestream/counter"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/reducestream/counter
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/reducestream/counter /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/reducestream/counter/pipeline.yaml

@@ -13,12 +13,13 @@ spec:
       udf:
         container:
           # Tell the input number is even or odd, see https://github.com/numaproj/numaflow-go/tree/main/pkg/mapper/examples/even_odd
-          image: quay.io/numaio/numaflow-go/map-even-odd:v0.6.1
+          image: quay.io/numaio/numaflow-go/map-even-odd:stable
+          imagePullPolicy: Always
     - name: compute-sum
       udf:
         container:
           # compute the sum
-          image: quay.io/numaio/numaflow-python/reduce-stream-counter:v0.7.0
+          image: quay.io/numaio/numaflow-python/reduce-stream-counter:stable
           imagePullPolicy: Always
           env:
             - name: PYTHONDEBUG

examples/reducestream/sum/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/reducestream/sum"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/reducestream/sum
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/reducestream/sum /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000

examples/reducestream/sum/pipeline.yaml

@@ -13,12 +13,13 @@ spec:
       udf:
         container:
           # Tell the input number is even or odd, see https://github.com/numaproj/numaflow-go/tree/main/pkg/mapper/examples/even_odd
-          image: quay.io/numaio/numaflow-go/map-even-odd:v0.6.1
+          image: quay.io/numaio/numaflow-go/map-even-odd:stable
+          imagePullPolicy: Always
     - name: compute-sum
       udf:
         container:
           # compute the sum
-          image: quay.io/numaio/numaflow-python/reduce-stream-sum:v0.7.0
+          image: quay.io/numaio/numaflow-python/reduce-stream-sum:stable
           imagePullPolicy: Always
           env:
             - name: PYTHONDEBUG

examples/sideinput/simple_sideinput/Dockerfile

@@ -14,9 +14,10 @@ ENV PYTHONFAULTHANDLER=1 \
   POETRY_HOME="/opt/poetry" \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
   POETRY_NO_INTERACTION=1 \
-  PYSETUP_PATH="/opt/pysetup" \
-  VENV_PATH="/opt/pysetup/.venv"
+  PYSETUP_PATH="/opt/pysetup"
 
+ENV EXAMPLE_PATH="$PYSETUP_PATH/examples/sideinput/simple_sideinput"
+ENV VENV_PATH="$EXAMPLE_PATH/.venv"
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
 RUN apt-get update \
@@ -41,16 +42,13 @@ FROM builder AS udf
 WORKDIR $PYSETUP_PATH
 COPY ./ ./
 
-WORKDIR $PYSETUP_PATH/examples/sideinput/simple_sideinput
+WORKDIR $EXAMPLE_PATH
 RUN poetry install --no-cache --no-root && \
     rm -rf ~/.cache/pypoetry/
 
-COPY examples/sideinput/simple_sideinput /app
-WORKDIR /app
-
 RUN chmod +x entry.sh
 
 ENTRYPOINT ["/dumb-init", "--"]
-CMD ["/app/entry.sh"]
+CMD ["sh", "-c", "$EXAMPLE_PATH/entry.sh"]
 
-EXPOSE 5000
+EXPOSE 5000