Fail entrypoint if patching fails; fix #238

rucio · Jan 24, 2024 · 4a0f1f2 · 4a0f1f2
1 parent dc3ccfa
commit 4a0f1f2
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 8 deletions.
diff --git a/daemons/Dockerfile b/daemons/Dockerfile
@@ -6,7 +6,7 @@
 
 FROM almalinux:9 as rpm_builder
     RUN dnf upgrade -y
-    RUN dnf install -y rpm-build rpmdevtools yum-utils epel-release.noarch
+    RUN dnf install -y rpm-build rpmdevtools yum-utils epel-release.noarch patchutils
     RUN yum-config-manager --enable crb
     # BUILD and install openssl 3.1
     ADD openssl.spec    /root/rpmbuild/SPECS/openssl.spec

diff --git a/daemons/start-daemon.sh b/daemons/start-daemon.sh
@@ -37,8 +37,31 @@ then
     echo "Patches found. Trying to apply them"
     for patchfile in /patch/*
     do
-        echo "Apply patch ${patchfile}"
-        patch -p3 -d "$RUCIO_PYTHON_PATH" < $patchfile
+        echo "Applying patch ${patchfile}"
+
+        bin_patch=$(filterdiff -i '*/bin/*' ${patchfile})
+
+        if [ -n "$bin_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_PYTHON_PATH" < $bin_patch
+            then
+                echo "Patch ${bin_patch} applied."
+            else
+                echo "Patch ${bin_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
+
+        lib_patch=$(filterdiff -i '*/lib/*' ${patchfile})
+
+        if [ -n "$lib_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_PYTHON_PATH" < $lib_patch
+            then
+                echo "Patch ${lib_patch} applied."
+            else
+                echo "Patch ${lib_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
     done
 fi
 

diff --git a/server/Dockerfile b/server/Dockerfile
@@ -21,6 +21,7 @@ RUN dnf install -y epel-release.noarch && \
         python-pip \
         python-mod_wsgi \
         memcached && \
+        patchutils && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \

diff --git a/server/docker-entrypoint.sh b/server/docker-entrypoint.sh
@@ -48,8 +48,31 @@ then
     echo "Patches found. Trying to apply them"
     for patchfile in /patch/*
     do
-        echo "Apply patch ${patchfile}"
-        patch -p3 -d "$RUCIO_PYTHON_PATH" < $patchfile
+        echo "Applying patch ${patchfile}"
+
+        bin_patch=$(filterdiff -i '*/bin/*' ${patchfile})
+
+        if [ -n "$bin_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_PYTHON_PATH" < $bin_patch
+            then
+                echo "Patch ${bin_patch} applied."
+            else
+                echo "Patch ${bin_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
+
+        lib_patch=$(filterdiff -i '*/lib/*' ${patchfile})
+
+        if [ -n "$lib_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_PYTHON_PATH" < $lib_patch
+            then
+                echo "Patch ${lib_patch} applied."
+            else
+                echo "Patch ${lib_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
     done
 fi
 

diff --git a/webui/Dockerfile b/webui/Dockerfile
@@ -17,7 +17,7 @@ RUN dnf -y update && \
     dnf -y module reset nodejs && \
     dnf -y module enable nodejs:18 && \
     dnf -y module install nodejs:18/common && \
-    dnf -y install httpd mod_ssl python39 python-pip git procps && \
+    dnf -y install httpd mod_ssl python39 python-pip git procps patchutils && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 

diff --git a/webui/docker-entrypoint.sh b/webui/docker-entrypoint.sh
@@ -16,10 +16,34 @@ then
     echo "Patches found. Trying to apply them"
     for patchfile in /patch/*
     do
-        echo "Apply patch ${patchfile}"
-        patch -p3 -d "$RUCIO_WEBUI_PATH" < $patchfile
+        echo "Applying patch ${patchfile}"
+
+        bin_patch=$(filterdiff -i '*/bin/*' ${patchfile})
+
+        if [ -n "$bin_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_WEBUI_PATH" < $bin_patch
+            then
+                echo "Patch ${bin_patch} applied."
+            else
+                echo "Patch ${bin_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
+
+        lib_patch=$(filterdiff -i '*/lib/*' ${patchfile})
+
+        if [ -n "$lib_patch" ]
+        then
+            if patch -p3 -d "$RUCIO_WEBUI_PATH" < $lib_patch
+            then
+                echo "Patch ${lib_patch} applied."
+            else
+                echo "Patch ${lib_patch} could not be applied successfully (exit code $?). Exiting setup."
+                exit 1
+            fi            
     done
 fi
 
+
 echo "=================== Starting RUCIO WEBUI ========================"
 npm run start