File tree Expand file tree Collapse file tree 3 files changed +18
-18
lines changed
Expand file tree Collapse file tree 3 files changed +18
-18
lines changed Original file line number Diff line number Diff line change @@ -133,14 +133,14 @@ conan profile detect
133133rm -rf /tmp/*
134134EOF
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.
138139RUN <<EOF
139140cat >> $(conan config home)/settings_user.yml <<EOT
140141os:
141142 debian-${DEBIAN_VERSION}:
142143EOT
143- sed -i "s/os=Linux/os=debian-${DEBIAN_VERSION}/g" $(conan config home)/profiles/default
144144EOF
145145
146146# Explicitly set the compiler flags.
@@ -228,14 +228,14 @@ conan profile detect
228228rm -rf /tmp/*
229229EOF
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.
233234RUN <<EOF
234235cat >> $(conan config home)/settings_user.yml <<EOT
235236os:
236237 debian-${DEBIAN_VERSION}:
237238EOT
238- sed -i "s/os=Linux/os=debian-${DEBIAN_VERSION}/g" $(conan config home)/profiles/default
239239EOF
240240
241241# Explicitly set the compiler flags and the distribution name and version.
Original file line number Diff line number Diff line change @@ -103,14 +103,14 @@ conan profile detect
103103rm -rf /tmp/*
104104EOF
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.
108109RUN <<EOF
109110cat >> $(conan config home)/settings_user.yml <<EOT
110111os:
111112 rhel-${RHEL_VERSION}:
112113EOT
113- sed -i "s/os=Linux/os=rhel-${RHEL_VERSION}/g" $(conan config home)/profiles/default
114114EOF
115115
116116# Explicitly set the compiler flags.
@@ -184,14 +184,14 @@ conan profile detect
184184rm -rf /tmp/*
185185EOF
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.
189190RUN <<EOF
190191cat >> $(conan config home)/settings_user.yml <<EOT
191192os:
192193 rhel-${RHEL_VERSION}:
193194EOT
194- sed -i "s/os=Linux/os=rhel-${RHEL_VERSION}/g" $(conan config home)/profiles/default
195195EOF
196196
197197# Explicitly set the compiler flags.
Original file line number Diff line number Diff line change @@ -119,14 +119,14 @@ conan profile detect
119119rm -rf /tmp/*
120120EOF
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.
124125RUN <<EOF
125126cat >> $(conan config home)/settings_user.yml <<EOT
126127os:
127128 ubuntu-${UBUNTU_VERSION}:
128129EOT
129- sed -i "s/os=Linux/os=ubuntu-${UBUNTU_VERSION}/g" $(conan config home)/profiles/default
130130EOF
131131
132132# Explicitly set the compiler flags.
@@ -211,14 +211,14 @@ conan profile detect
211211rm -rf /tmp/*
212212EOF
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.
216217RUN <<EOF
217218cat >> $(conan config home)/settings_user.yml <<EOT
218219os:
219220 ubuntu-${UBUNTU_VERSION}:
220221EOT
221- sed -i "s/os=Linux/os=ubuntu-${UBUNTU_VERSION}/g" $(conan config home)/profiles/default
222222EOF
223223
224224# Explicitly set the compiler flags.
You can’t perform that action at this time.
0 commit comments