Skip to content

Commit 77b8cd6

Browse files
committed
Remove sed call as the default profile gets overwritten anyway in the rippled repo
1 parent 9bb66f1 commit 77b8cd6

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

docker/debian/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ conan profile detect
133133
rm -rf /tmp/*
134134
EOF
135135

136-
# Add the distribution name and version, so they are taken into account when
137-
# building dependencies.
136+
# Add the distribution name and version, so they can be taken into account when
137+
# building dependencies. This requires setting the `os` field in the activated
138+
# profile where this image is used to the appropriate value.
138139
RUN <<EOF
139140
cat >> $(conan config home)/settings_user.yml <<EOT
140141
os:
141142
debian-${DEBIAN_VERSION}:
142143
EOT
143-
sed -i "s/os=Linux/os=debian-${DEBIAN_VERSION}/g" $(conan config home)/profiles/default
144144
EOF
145145

146146
# Explicitly set the compiler flags.
@@ -228,14 +228,14 @@ conan profile detect
228228
rm -rf /tmp/*
229229
EOF
230230

231-
# Add the distribution name and version, so they are taken into account when
232-
# building dependencies.
231+
# Add the distribution name and version, so they can be taken into account when
232+
# building dependencies. This requires setting the `os` field in the activated
233+
# profile where this image is used to the appropriate value.
233234
RUN <<EOF
234235
cat >> $(conan config home)/settings_user.yml <<EOT
235236
os:
236237
debian-${DEBIAN_VERSION}:
237238
EOT
238-
sed -i "s/os=Linux/os=debian-${DEBIAN_VERSION}/g" $(conan config home)/profiles/default
239239
EOF
240240

241241
# Explicitly set the compiler flags and the distribution name and version.

docker/rhel/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ conan profile detect
103103
rm -rf /tmp/*
104104
EOF
105105

106-
# Add the distribution name and version, so they are taken into account when
107-
# building dependencies.
106+
# Add the distribution name and version, so they can be taken into account when
107+
# building dependencies. This requires setting the `os` field in the activated
108+
# profile where this image is used to the appropriate value.
108109
RUN <<EOF
109110
cat >> $(conan config home)/settings_user.yml <<EOT
110111
os:
111112
rhel-${RHEL_VERSION}:
112113
EOT
113-
sed -i "s/os=Linux/os=rhel-${RHEL_VERSION}/g" $(conan config home)/profiles/default
114114
EOF
115115

116116
# Explicitly set the compiler flags.
@@ -184,14 +184,14 @@ conan profile detect
184184
rm -rf /tmp/*
185185
EOF
186186

187-
# Add the distribution name and version, so they are taken into account when
188-
# building dependencies.
187+
# Add the distribution name and version, so they can be taken into account when
188+
# building dependencies. This requires setting the `os` field in the activated
189+
# profile where this image is used to the appropriate value.
189190
RUN <<EOF
190191
cat >> $(conan config home)/settings_user.yml <<EOT
191192
os:
192193
rhel-${RHEL_VERSION}:
193194
EOT
194-
sed -i "s/os=Linux/os=rhel-${RHEL_VERSION}/g" $(conan config home)/profiles/default
195195
EOF
196196

197197
# Explicitly set the compiler flags.

docker/ubuntu/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ conan profile detect
119119
rm -rf /tmp/*
120120
EOF
121121

122-
# Add the distribution name and version, so they are taken into account when
123-
# building dependencies.
122+
# Add the distribution name and version, so they can be taken into account when
123+
# building dependencies. This requires setting the `os` field in the activated
124+
# profile where this image is used to the appropriate value.
124125
RUN <<EOF
125126
cat >> $(conan config home)/settings_user.yml <<EOT
126127
os:
127128
ubuntu-${UBUNTU_VERSION}:
128129
EOT
129-
sed -i "s/os=Linux/os=ubuntu-${UBUNTU_VERSION}/g" $(conan config home)/profiles/default
130130
EOF
131131

132132
# Explicitly set the compiler flags.
@@ -211,14 +211,14 @@ conan profile detect
211211
rm -rf /tmp/*
212212
EOF
213213

214-
# Add the distribution name and version, so they are taken into account when
215-
# building dependencies.
214+
# Add the distribution name and version, so they can be taken into account when
215+
# building dependencies. This requires setting the `os` field in the activated
216+
# profile where this image is used to the appropriate value.
216217
RUN <<EOF
217218
cat >> $(conan config home)/settings_user.yml <<EOT
218219
os:
219220
ubuntu-${UBUNTU_VERSION}:
220221
EOT
221-
sed -i "s/os=Linux/os=ubuntu-${UBUNTU_VERSION}/g" $(conan config home)/profiles/default
222222
EOF
223223

224224
# Explicitly set the compiler flags.

0 commit comments

Comments
 (0)