Skip to content

Commit af5fd10

Browse files
authored
Merge pull request #207 from loganprice/lima_profile
feat: add ability to load env vars via profile
2 parents 3448d84 + 81d4831 commit af5fd10

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

pkg/cidata/cidata.TEMPLATE.d/boot.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ WARNING() {
1212
# shellcheck disable=SC2163
1313
while read -r line; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
1414

15+
sed -i '/#LIMA-START/,/#LIMA-END/d' /etc/environment
16+
cat "${LIMA_CIDATA_MNT}/lima.environment" >>/etc/environment
17+
18+
# shellcheck disable=SC2163
19+
while read -r line; do
20+
[ "$(expr "$line" : '#')" -eq 0 ] && export "$line"
21+
done <"${LIMA_CIDATA_MNT}"/lima.environment
22+
1523
CODE=0
1624

1725
for f in "${LIMA_CIDATA_MNT}"/boot/*; do

pkg/cidata/cidata.TEMPLATE.d/lima.env

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ LIMA_CIDATA_CONTAINERD_SYSTEM=1
1515
LIMA_CIDATA_CONTAINERD_SYSTEM=
1616
{{- end}}
1717
LIMA_CIDATA_SLIRP_GATEWAY={{ .SlirpGateway }}
18-
{{- range $key, $val := .Env}}
19-
{{$key}}={{$val}}
20-
{{- end}}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#LIMA-START
2+
{{- range $key, $val := .Env}}
3+
{{$key}}={{$val}}
4+
{{- end}}
5+
#LIMA-END

0 commit comments

Comments
 (0)