Do not use dead symlink in repository. (#226)

Instead of them create symlink in Dockerfile's directly. Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
sclorg · Mar 25, 2024 · f503ec7 · f503ec7
1 parent fdc08c7
commit f503ec7
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 69 deletions.
diff --git a/10.11/Dockerfile.c8s b/10.11/Dockerfile.c8s
@@ -53,6 +53,11 @@ COPY 10.11/root-common /
 COPY 10.11/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.11/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.11/Dockerfile.c9s b/10.11/Dockerfile.c9s
@@ -53,6 +53,11 @@ COPY 10.11/root-common /
 COPY 10.11/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.11/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.11/Dockerfile.fedora b/10.11/Dockerfile.fedora
@@ -55,6 +55,11 @@ COPY 10.11/root-common /
 COPY 10.11/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.11/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -63,10 +68,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.11/Dockerfile.rhel8 b/10.11/Dockerfile.rhel8
@@ -53,6 +53,11 @@ COPY 10.11/root-common /
 COPY 10.11/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.11/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.11/Dockerfile.rhel9 b/10.11/Dockerfile.rhel9
@@ -53,6 +53,11 @@ COPY 10.11/root-common /
 COPY 10.11/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.11/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.3/Dockerfile b/10.3/Dockerfile
@@ -61,6 +61,11 @@ COPY 10.3/root-common /
 COPY 10.3/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.3/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -69,10 +74,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.3/Dockerfile.c8s b/10.3/Dockerfile.c8s
@@ -53,6 +53,11 @@ COPY 10.3/root-common /
 COPY 10.3/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.3/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.3/Dockerfile.fedora b/10.3/Dockerfile.fedora
@@ -56,6 +56,11 @@ COPY 10.3/root-common /
 COPY 10.3/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.3/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -64,10 +69,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.3/Dockerfile.rhel7 b/10.3/Dockerfile.rhel7
@@ -62,6 +62,11 @@ COPY 10.3/root-common /
 COPY 10.3/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.3/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -70,10 +75,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.3/Dockerfile.rhel8 b/10.3/Dockerfile.rhel8
@@ -53,6 +53,11 @@ COPY 10.3/root-common /
 COPY 10.3/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.3/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile b/10.5/Dockerfile
@@ -61,6 +61,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -69,10 +74,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.c8s b/10.5/Dockerfile.c8s
@@ -53,6 +53,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.c9s b/10.5/Dockerfile.c9s
@@ -53,6 +53,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.fedora b/10.5/Dockerfile.fedora
@@ -56,6 +56,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -64,10 +69,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.rhel7 b/10.5/Dockerfile.rhel7
@@ -62,6 +62,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -70,10 +75,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.rhel8 b/10.5/Dockerfile.rhel8
@@ -53,6 +53,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -61,10 +66,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/10.5/Dockerfile.rhel9 b/10.5/Dockerfile.rhel9
@@ -52,6 +52,11 @@ COPY 10.5/root-common /
 COPY 10.5/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 10.5/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -60,10 +65,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]

diff --git a/s2i-common/bin/run b/s2i-common/bin/run