Skip to content

Commit 1a91d2f

Browse files
authored
Remove dead link from this repo (#552)
* Do not use dead symlink in repository. Instead of them create symlink in Dockerfile's directly. * Add generated files
1 parent 3f3a619 commit 1a91d2f

34 files changed

+130
-11
lines changed

10/Dockerfile.c8s

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6060
COPY root /
6161
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6262

63+
# Hard links are not supported in Testing Farm approach during sync to guest
64+
# operation system. Therefore tests are failing on error
65+
# /usr/libexec/s2i/run no such file or directory
66+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
67+
6368
# Not using VOLUME statement since it's not working in OpenShift Online:
6469
# https://github.com/sclorg/httpd-container/issues/30
6570
# VOLUME ["/var/lib/pgsql/data"]

10/Dockerfile.rhel7

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6363
COPY root /
6464
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6565

66+
# Hard links are not supported in Testing Farm approach during sync to guest
67+
# operation system. Therefore tests are failing on error
68+
# /usr/libexec/s2i/run no such file or directory
69+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
70+
6671
# When bash is started non-interactively, to run a shell script, for example it
6772
# looks for this variable and source the content of this file. This will enable
6873
# the SCL for all scripts without need to do 'scl enable'.

10/Dockerfile.rhel8

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6161
COPY root /
6262
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6363

64+
# Hard links are not supported in Testing Farm approach during sync to guest
65+
# operation system. Therefore tests are failing on error
66+
# /usr/libexec/s2i/run no such file or directory
67+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
68+
6469
# Not using VOLUME statement since it's not working in OpenShift Online:
6570
# https://github.com/sclorg/httpd-container/issues/30
6671
# VOLUME ["/var/lib/pgsql/data"]

10/s2i/bin/run

Lines changed: 0 additions & 1 deletion
This file was deleted.

12/Dockerfile.c8s

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6161
COPY root /
6262
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6363

64+
# Hard links are not supported in Testing Farm approach during sync to guest
65+
# operation system. Therefore tests are failing on error
66+
# /usr/libexec/s2i/run no such file or directory
67+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
68+
6469
# Not using VOLUME statement since it's not working in OpenShift Online:
6570
# https://github.com/sclorg/httpd-container/issues/30
6671
# VOLUME ["/var/lib/pgsql/data"]

12/Dockerfile.fedora

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
6262
COPY root /
6363
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6464

65+
# Hard links are not supported in Testing Farm approach during sync to guest
66+
# operation system. Therefore tests are failing on error
67+
# /usr/libexec/s2i/run no such file or directory
68+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
69+
6570
VOLUME ["/var/lib/pgsql/data"]
6671

6772
# S2I permission fixes

12/Dockerfile.rhel7

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6464
COPY root /
6565
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6666

67+
# Hard links are not supported in Testing Farm approach during sync to guest
68+
# operation system. Therefore tests are failing on error
69+
# /usr/libexec/s2i/run no such file or directory
70+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
71+
6772
# When bash is started non-interactively, to run a shell script, for example it
6873
# looks for this variable and source the content of this file. This will enable
6974
# the SCL for all scripts without need to do 'scl enable'.

12/Dockerfile.rhel8

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6262
COPY root /
6363
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6464

65+
# Hard links are not supported in Testing Farm approach during sync to guest
66+
# operation system. Therefore tests are failing on error
67+
# /usr/libexec/s2i/run no such file or directory
68+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
69+
6570
# Not using VOLUME statement since it's not working in OpenShift Online:
6671
# https://github.com/sclorg/httpd-container/issues/30
6772
# VOLUME ["/var/lib/pgsql/data"]

12/s2i/bin/run

Lines changed: 0 additions & 1 deletion
This file was deleted.

13/Dockerfile.c8s

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
6161
COPY root /
6262
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
6363

64+
# Hard links are not supported in Testing Farm approach during sync to guest
65+
# operation system. Therefore tests are failing on error
66+
# /usr/libexec/s2i/run no such file or directory
67+
RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
68+
6469
# Not using VOLUME statement since it's not working in OpenShift Online:
6570
# https://github.com/sclorg/httpd-container/issues/30
6671
# VOLUME ["/var/lib/pgsql/data"]

0 commit comments

Comments
 (0)