Skip to content

Commit

Permalink
Manifest and postinstall updated for rootless
Browse files Browse the repository at this point in the history
  • Loading branch information
madelen-at-work committed Apr 15, 2024
1 parent e6dc46a commit 0cd853c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ RUN <<EOF
-a slirp4netns \
-a rootlesskit \
-a rootlesskit-docker-proxy \
-a nsenter
-a nsenter \
--disable-manifest-validation
EOF

ENTRYPOINT [ "/opt/axis/acapsdk/sysroots/x86_64-pokysdk-linux/usr/bin/eap-install.sh" ]
Expand Down
17 changes: 12 additions & 5 deletions app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
{
"schemaVersion": "1.3",
"schemaVersion": "1.7.0",
"resources": {
"linux": {
"user": {
"groups": ["storage"]
}
}
},
"acapPackageConf": {
"setup": {
"friendlyName": "Docker Daemon",
"appId": "414120",
"appName": "dockerdwrapper",
"vendor": "Axis Communications",
"embeddedSdkVersion": "3.0",
"user": {
"group": "root",
"username": "root"
},
"vendorUrl": "https://www.axis.com",
"runMode": "once",
"version": "2.0.0"
Expand Down Expand Up @@ -56,6 +59,10 @@
"type": "hidden:string"
}
],
"containers": {
"containerHost": true,
"createDockerSymlinks": true
},
"settingPage": "index.html",
"httpConfig": [
{
Expand Down
10 changes: 0 additions & 10 deletions app/postinstallscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,3 @@ if [ ! -e localdata/daemon.json ]; then
else
rm empty_daemon.json
fi

# Make sure containerd is started before dockerd and set PATH
cat >>/etc/systemd/system/sdkdockerdwrapper.service <<EOF
[Unit]
BindsTo=containerd.service
After=network-online.target containerd.service var-spool-storage-SD_DISK.mount
Wants=network-online.target
[Service]
Environment=PATH=/usr/local/packages/dockerdwrapper:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
EOF

0 comments on commit 0cd853c

Please sign in to comment.