Skip to content

Commit

Permalink
Do not use dead symlink in repository.
Browse files Browse the repository at this point in the history
Instead of them create symlink in Dockerfile's directly.

Signed-off-by: Petr "Stone" Hracek <[email protected]>
  • Loading branch information
phracek committed Mar 25, 2024
1 parent 3151602 commit b130a74
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 28 deletions.
8 changes: 5 additions & 3 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -72,9 +77,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

Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.c8s
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
/usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
/usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -66,10 +71,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
/usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.rhel7
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -72,10 +77,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
${MYSQL_PREFIX}/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -63,10 +68,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
/usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
9 changes: 5 additions & 4 deletions 8.0/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/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.
Expand All @@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
rpm-file-permissions && \
/usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"

# 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"]
Expand Down
1 change: 0 additions & 1 deletion s2i-common/bin/run

This file was deleted.

0 comments on commit b130a74

Please sign in to comment.