Skip to content

Commit 899ab6c

Browse files
hannahileahannahilea
authored
HYRAX-2041: Fix lingering paths in bes.conf (#144)
* fix paths in bes.conf * fix upstream bes path error --------- Co-authored-by: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
1 parent 6a1f1ba commit 899ab6c

6 files changed

Lines changed: 54 additions & 18 deletions

File tree

‎el8-builds/besd/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,20 @@ RUN set -e \
6969
# BES is already installed on the base image, but
7070
# we need to do some additional configuration
7171

72+
# Patch a mistake that was introduced at the bes_core layer
73+
# After it's fixed in the bes repo, this line will be redundant
74+
# and we can remove it
75+
RUN cp -r /share/bes /usr/share/bes \
76+
&& cp -r /share/hyrax /usr/share/hyrax
77+
7278
# Adapted from bes/spec.all_static.in in RPM creation.
7379
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
7480
# vestigial substitutions for a build process past.
7581
RUN sed -i.dist \
7682
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
77-
-e 's:=.*/lib/bes:=/lib/bes:' \
78-
-e 's:=.*/share/bes:=/share/bes:' \
79-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
83+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
84+
-e 's:=.*/share/bes:=/usr/share/bes:' \
85+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
8086
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
8187
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
8288
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

‎el8-builds/hyrax/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,20 @@ RUN set -e \
166166
# BES is already installed on the base image, but
167167
# we need to do some additional configuration
168168

169+
# Patch a mistake that was introduced at the bes_core layer
170+
# After it's fixed in the bes repo, this line will be redundant
171+
# and we can remove it
172+
RUN cp -r /share/bes /usr/share/bes \
173+
&& cp -r /share/hyrax /usr/share/hyrax
174+
169175
# Adapted from bes/spec.all_static.in in RPM creation.
170176
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
171177
# vestigial substitutions for a build process past.
172178
RUN sed -i.dist \
173179
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
174-
-e 's:=.*/lib/bes:=/lib/bes:' \
175-
-e 's:=.*/share/bes:=/share/bes:' \
176-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
180+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
181+
-e 's:=.*/share/bes:=/usr/share/bes:' \
182+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
177183
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
178184
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
179185
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

‎el8-builds/ngap/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,20 @@ RUN set -e \
147147
# BES is already installed on the base image, but
148148
# we need to do some additional configuration
149149

150+
# Patch a mistake that was introduced at the bes_core layer
151+
# After it's fixed in the bes repo, this line will be redundant
152+
# and we can remove it
153+
RUN cp -r /share/bes /usr/share/bes \
154+
&& cp -r /share/hyrax /usr/share/hyrax
155+
150156
# Adapted from bes/spec.all_static.in in RPM creation.
151157
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
152158
# vestigial substitutions for a build process past.
153159
RUN sed -i.dist \
154160
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
155-
-e 's:=.*/lib/bes:=/lib/bes:' \
156-
-e 's:=.*/share/bes:=/share/bes:' \
157-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
161+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
162+
-e 's:=.*/share/bes:=/usr/share/bes:' \
163+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
158164
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
159165
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
160166
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

‎el9-builds/besd/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,20 @@ RUN set -e \
9494
# BES is already installed on the base image, but
9595
# we need to do some additional configuration
9696

97+
# Patch a mistake that was introduced at the bes_core layer
98+
# After it's fixed in the bes repo, this line will be redundant
99+
# and we can remove it
100+
RUN cp -r /share/bes /usr/share/bes \
101+
&& cp -r /share/hyrax /usr/share/hyrax
102+
97103
# Adapted from bes/spec.all_static.in in RPM creation.
98104
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
99105
# vestigial substitutions for a build process past.
100106
RUN sed -i.dist \
101107
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
102-
-e 's:=.*/lib/bes:=/lib/bes:' \
103-
-e 's:=.*/share/bes:=/share/bes:' \
104-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
108+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
109+
-e 's:=.*/share/bes:=/usr/share/bes:' \
110+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
105111
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
106112
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
107113
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

‎el9-builds/hyrax/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,20 @@ RUN set -e \
205205
# BES is already installed on the base image, but
206206
# we need to do some additional configuration
207207

208+
# Patch a mistake that was introduced at the bes_core layer
209+
# After it's fixed in the bes repo, this line will be redundant
210+
# and we can remove it
211+
RUN cp -r /share/bes /usr/share/bes \
212+
&& cp -r /share/hyrax /usr/share/hyrax
213+
208214
# Adapted from bes/spec.all_static.in in RPM creation.
209215
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
210216
# vestigial substitutions for a build process past.
211217
RUN sed -i.dist \
212218
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
213-
-e 's:=.*/lib/bes:=/lib/bes:' \
214-
-e 's:=.*/share/bes:=/share/bes:' \
215-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
219+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
220+
-e 's:=.*/share/bes:=/usr/share/bes:' \
221+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
216222
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
217223
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
218224
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

‎el9-builds/ngap/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,20 @@ RUN set -e \
265265
# BES is already installed on the base image, but
266266
# we need to do some additional configuration
267267

268+
# Patch a mistake that was introduced at the bes_core layer
269+
# After it's fixed in the bes repo, this line will be redundant
270+
# and we can remove it
271+
RUN cp -r /share/bes /usr/share/bes \
272+
&& cp -r /share/hyrax /usr/share/hyrax
273+
268274
# Adapted from bes/spec.all_static.in in RPM creation.
269275
# The four *.pem substitutions may be unnecessary, as those *.pem files may be
270276
# vestigial substitutions for a build process past.
271277
RUN sed -i.dist \
272278
-e 's:=.*/bes.log:=/var/log/bes/bes.log:' \
273-
-e 's:=.*/lib/bes:=/lib/bes:' \
274-
-e 's:=.*/share/bes:=/share/bes:' \
275-
-e 's:=.*/share/hyrax:=/share/hyrax:' \
279+
-e 's:=.*/lib/bes:=/usr/lib/bes:' \
280+
-e 's:=.*/share/bes:=/usr/share/bes:' \
281+
-e 's:=.*/share/hyrax:=/usr/share/hyrax:' \
276282
-e 's:=/full/path/to/serverside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \
277283
-e 's:=/full/path/to/serverside/key/file.pem:=/etc/pki/bes/public/file.pem:' \
278284
-e 's:=/full/path/to/clientside/certificate/file.pem:=/etc/pki/bes/cacerts/file.pem:' \

0 commit comments

Comments
 (0)