File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -63,14 +63,16 @@ $CMD $args
6363EOF
6464chmod +x /usr/local/bin/docker_commandline.sh
6565
66+ # here we force install/refresh snapd as the deb version may be outdated and
67+ # not support installing the snapcraft base anymore
6668cat > /etc/systemd/system/docker-exec.service << EOF
6769[Unit]
6870Description=Docker commandline
6971Wants=snapd.seeded.service
7072After=snapd.service snapd.socket snapd.seeded.service
7173
7274[Service]
73- ExecStartPre=/bin/bash -c '/usr/bin/snap install snapcraft --classic --channel $USE_SNAPCRAFT_CHANNEL < /dev/null'
75+ ExecStartPre=/bin/bash -c '/usr/bin/snap install snapd || /usr/bin/snap refresh snapd && /usr/bin/snap install snapcraft --classic --channel $USE_SNAPCRAFT_CHANNEL < /dev/null'
7476ExecStart=/usr/local/bin/docker_commandline.sh
7577Environment="SNAPPY_LAUNCHER_INSIDE_TESTS=true"
7678Environment="LANG=C.UTF-8"
You can’t perform that action at this time.
0 commit comments