Overview
Comment: | Some docker updates |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 9d8f6caf41f00700f6f22c05349419ce931ab2ec |
User & Date: | rkeene on 2017-12-15 05:32:19 |
Other Links: | manifest | tags |
Context
2017-12-15
| ||
05:32 | AppFS 1.10 check-in: 1b562faeed user: rkeene tags: trunk, 1.10 | |
05:32 | Some docker updates check-in: 9d8f6caf41 user: rkeene tags: trunk | |
05:31 | Updated to support a "-lib" option to the "install" command of "appfs-cache" check-in: a664b039b7 user: rkeene tags: trunk | |
Changes
Modified build/docker/Dockerfile from [42acc0ed9e] to [bbc31a5c72].
1 1 FROM scratch 2 2 3 -COPY init appfsd /bin/ 3 +COPY init appfsd appfs-cache /bin/ 4 4 5 5 ENTRYPOINT ["/bin/init"]
Modified build/docker/init.c from [ecb8eda1cf] to [98580b3f9b].
47 47 if (access("/dev/fuse", F_OK) != 0) { 48 48 fprintf(stderr, "This container needs to be run as: docker run --cap-add SYS_ADMIN --device /dev/fuse ...\n"); 49 49 50 50 return(1); 51 51 } 52 52 53 53 mkdir("/bin", 0755); 54 + mkdir("/lib", 0755); 54 55 mkdir("/opt", 0755); 55 56 mkdir("/opt/appfs", 0755); 56 57 mkdir("/var", 0755); 57 58 mkdir("/var/cache", 0755); 58 59 mkdir("/var/cache/appfs", 0755); 59 60 run("/bin/appfsd", "appfsd", "/var/cache/appfs", "/opt/appfs", NULL); 60 61 61 62 symlink(".", "/usr"); 63 + symlink("lib", "/lib64"); 64 + 62 65 symlink("/opt/appfs/core.appfs.rkeene.org/bash/platform/latest/bin/bash", "/bin/bash"); 63 66 symlink("/opt/appfs/core.appfs.rkeene.org/coreutils/platform/latest/bin/env", "/bin/env"); 64 67 65 68 symlink("/bin/bash", "/bin/sh"); 66 69 67 70 setenv("PATH", "/bin:/opt/appfs/core.appfs.rkeene.org/coreutils/platform/latest/bin", 1); 68 - run("/bin/appfs-install-pkg", "appfs-install-pkg", "core.appfs.rkeene.org", "coreutils", NULL); 71 + run("/bin/appfs-cache", "appfs-cache", "install", "-lib", "core.appfs.rkeene.org", "glibc", NULL); 72 + run("/bin/appfs-cache", "appfs-cache", "install", "core.appfs.rkeene.org", "coreutils", NULL); 69 73 setenv("PATH", "/bin", 1); 70 74 71 75 if (argc == 1) { 72 76 run("/bin/sh", "sh", NULL); 73 77 } else { 74 78 argv++; 75 79 execvp(argv[0], argv); 76 80 } 77 81 78 82 return(0); 79 83 }