Skip to content

Commit 421423c

Browse files
committed
Replace hardcoded ~/.conan2 home with $(conan config home)
1 parent 841e7fd commit 421423c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ rm -rf /tmp/*
135135
EOF
136136

137137
# Fix the C++ dialect.
138-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/profiles/default
138+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
139139
# Explicitly set the compiler flags.
140140
RUN <<EOF
141141
cat >> $(conan config home)/global.conf <<EOT
@@ -208,7 +208,7 @@ rm -rf /tmp/*
208208
EOF
209209

210210
# Fix the C++ dialect.
211-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/profiles/default
211+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
212212
# Explicitly set the compiler flags. To ensure compatibility with a range of
213213
# Clang compilers, we must also add extra flags that apply to certain versions
214214
# of Clang.

docker/rhel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ rm -rf /tmp/*
9898
EOF
9999

100100
# Fix the C++ dialect.
101-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
101+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
102102
# Explicitly set the compiler flags.
103103
RUN <<EOF
104104
cat >> $(conan config home)/global.conf <<EOT
@@ -180,7 +180,7 @@ rm -rf /tmp/*
180180
EOF
181181

182182
# Fix the C++ dialect.
183-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
183+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
184184
# Explicitly set the compiler flags. To ensure compatibility with a range of
185185
# Clang compilers, we must also add extra flags that apply to certain versions
186186
# of Clang.

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ rm -rf /tmp/*
115115
EOF
116116

117117
# Fix the C++ dialect.
118-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/profiles/default
118+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
119119
# Explicitly set the compiler flags.
120120
RUN <<EOF
121121
cat >> $(conan config home)/global.conf <<EOT
@@ -201,7 +201,7 @@ rm -rf /tmp/*
201201
EOF
202202

203203
# Fix the C++ dialect.
204-
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/profiles/default
204+
RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
205205
# Explicitly set the compiler flags. To ensure compatibility with a range of
206206
# Clang compilers, we must also add extra flags that apply to certain versions
207207
# of Clang.

0 commit comments

Comments
 (0)