Skip to content

Commit

Permalink
Merge pull request #6799 from rancher-sandbox/rddepman/lima/0.19.0.rd…
Browse files Browse the repository at this point in the history
…7-to-0.21.0.rd1

rddepman: bump lima from 0.19.0.rd7 to 0.21.0.rd2
  • Loading branch information
mook-as authored May 1, 2024
2 parents 43a6a53 + 70f7ccf commit a5ea0ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/rancher-desktop/assets/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lima: 0.19.0.rd7
lima: 0.21.0.rd2
limaAndQemu: 1.31.3
alpineLimaISO:
isoVersion: 0.2.38.rd1
Expand Down
10 changes: 5 additions & 5 deletions pkg/rancher-desktop/assets/lima-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ provision:
# Create symlink if certs.d doesn't exist (user may have created a regular directory).
if [ ! -e /etc/docker/certs.d ]; then
# We don't know if the host is Linux or macOS, so we take a guess based on which mountpoint exists.
if [ -d "/Users/${LIMA_CIDATA_USER}" ]; then
ln -s "/Users/${LIMA_CIDATA_USER}/.docker/certs.d" /etc/docker
elif [ -d "/home/${LIMA_CIDATA_USER}" ]; then
ln -s "/home/${LIMA_CIDATA_USER}/.docker/certs.d" /etc/docker
if [ -d "/Users/{{.User}}" ]; then
ln -s "/Users/{{.User}}/.docker/certs.d" /etc/docker
elif [ -d "/home/{{.User}}" ]; then
ln -s "/home/{{.User}}/.docker/certs.d" /etc/docker
fi
fi
- # Make sure hostname doesn't change during upgrade from earlier versions
Expand Down Expand Up @@ -130,7 +130,7 @@ provision:
mode: system
script: |
set -o errexit -o nounset -o xtrace
usermod --append --groups docker "${LIMA_CIDATA_USER}"
usermod --append --groups docker "{{.User}}"
- # Install mkcert and prepare default/fallback cert for localhost
mode: system
script: |
Expand Down

0 comments on commit a5ea0ed

Please sign in to comment.