Fossil SCM
Comment and whitespace tweaks
Commit
81c30ab97d39138e41d80fe3d4270669c29252dbdedd4e806a36f3bd447b62a4
Parent
ac95559482cbc49…
2 files changed
+5
-5
+1
-1
+5
-5
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -33,13 +33,13 @@ | ||
| 33 | 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | 34 | |
| 35 | 35 | ### The changeable Fossil layer is the only one in the first stage that |
| 36 | 36 | ### changes often, so add it last, to make it independent of the others. |
| 37 | 37 | ### |
| 38 | -### $FSLSTB can be either a file or a directory due to a ADD's bizarre | |
| 39 | -### behavior: it unpacks tarballs when added from a local file but not | |
| 40 | -### from a URL! It matters because we default to a URL in case you're | |
| 38 | +### $FSLSTB can be either a file or a directory due to a bizarre ADD | |
| 39 | +### misfeature: it unpacks tarballs when added from a local file but not | |
| 40 | +### from a URL! It matters because we default to a URL in case you're | |
| 41 | 41 | ### building outside a Fossil checkout, but when building via the |
| 42 | 42 | ### container-image target, we can avoid a costly hit on the Fossil |
| 43 | 43 | ### project's home site by pulling the data from the local repo via the |
| 44 | 44 | ### "tarball" command. This is a DVCS, after all! |
| 45 | 45 | ARG FSLCFG="" |
| @@ -93,16 +93,16 @@ | ||
| 93 | 93 | /bin/sqlite3 \ |
| 94 | 94 | && chmod +x /bin/sha?sum /bin/sqlite3 |
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | ## --------------------------------------------------------------------- |
| 98 | -## STAGE 3: Run! | |
| 98 | +## RUN! | |
| 99 | 99 | ## --------------------------------------------------------------------- |
| 100 | 100 | |
| 101 | 101 | EXPOSE 8080/tcp |
| 102 | 102 | CMD [ \ |
| 103 | 103 | "fossil", "server", \ |
| 104 | 104 | "--chroot", "/jail", \ |
| 105 | 105 | "--create", \ |
| 106 | 106 | "--jsmode", "bundled", \ |
| 107 | 107 | "--user", "admin", \ |
| 108 | - "museum/repo.fossil"] | |
| 108 | + "museum/repo.fossil" ] | |
| 109 | 109 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -33,13 +33,13 @@ | |
| 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | |
| 35 | ### The changeable Fossil layer is the only one in the first stage that |
| 36 | ### changes often, so add it last, to make it independent of the others. |
| 37 | ### |
| 38 | ### $FSLSTB can be either a file or a directory due to a ADD's bizarre |
| 39 | ### behavior: it unpacks tarballs when added from a local file but not |
| 40 | ### from a URL! It matters because we default to a URL in case you're |
| 41 | ### building outside a Fossil checkout, but when building via the |
| 42 | ### container-image target, we can avoid a costly hit on the Fossil |
| 43 | ### project's home site by pulling the data from the local repo via the |
| 44 | ### "tarball" command. This is a DVCS, after all! |
| 45 | ARG FSLCFG="" |
| @@ -93,16 +93,16 @@ | |
| 93 | /bin/sqlite3 \ |
| 94 | && chmod +x /bin/sha?sum /bin/sqlite3 |
| 95 | |
| 96 | |
| 97 | ## --------------------------------------------------------------------- |
| 98 | ## STAGE 3: Run! |
| 99 | ## --------------------------------------------------------------------- |
| 100 | |
| 101 | EXPOSE 8080/tcp |
| 102 | CMD [ \ |
| 103 | "fossil", "server", \ |
| 104 | "--chroot", "/jail", \ |
| 105 | "--create", \ |
| 106 | "--jsmode", "bundled", \ |
| 107 | "--user", "admin", \ |
| 108 | "museum/repo.fossil"] |
| 109 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -33,13 +33,13 @@ | |
| 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | |
| 35 | ### The changeable Fossil layer is the only one in the first stage that |
| 36 | ### changes often, so add it last, to make it independent of the others. |
| 37 | ### |
| 38 | ### $FSLSTB can be either a file or a directory due to a bizarre ADD |
| 39 | ### misfeature: it unpacks tarballs when added from a local file but not |
| 40 | ### from a URL! It matters because we default to a URL in case you're |
| 41 | ### building outside a Fossil checkout, but when building via the |
| 42 | ### container-image target, we can avoid a costly hit on the Fossil |
| 43 | ### project's home site by pulling the data from the local repo via the |
| 44 | ### "tarball" command. This is a DVCS, after all! |
| 45 | ARG FSLCFG="" |
| @@ -93,16 +93,16 @@ | |
| 93 | /bin/sqlite3 \ |
| 94 | && chmod +x /bin/sha?sum /bin/sqlite3 |
| 95 | |
| 96 | |
| 97 | ## --------------------------------------------------------------------- |
| 98 | ## RUN! |
| 99 | ## --------------------------------------------------------------------- |
| 100 | |
| 101 | EXPOSE 8080/tcp |
| 102 | CMD [ \ |
| 103 | "fossil", "server", \ |
| 104 | "--chroot", "/jail", \ |
| 105 | "--create", \ |
| 106 | "--jsmode", "bundled", \ |
| 107 | "--user", "admin", \ |
| 108 | "museum/repo.fossil" ] |
| 109 |
| --- containers/Dockerfile-nojail.patch | ||
| +++ containers/Dockerfile-nojail.patch | ||
| @@ -53,7 +53,7 @@ | ||
| 53 | 53 | "fossil", "server", \ |
| 54 | 54 | - "--chroot", "/jail", \ |
| 55 | 55 | "--create", \ |
| 56 | 56 | "--jsmode", "bundled", \ |
| 57 | 57 | "--user", "admin", \ |
| 58 | - "museum/repo.fossil"] | |
| 58 | + "museum/repo.fossil" ] | |
| 59 | 59 | |
| 60 | 60 |
| --- containers/Dockerfile-nojail.patch | |
| +++ containers/Dockerfile-nojail.patch | |
| @@ -53,7 +53,7 @@ | |
| 53 | "fossil", "server", \ |
| 54 | - "--chroot", "/jail", \ |
| 55 | "--create", \ |
| 56 | "--jsmode", "bundled", \ |
| 57 | "--user", "admin", \ |
| 58 | "museum/repo.fossil"] |
| 59 | |
| 60 |
| --- containers/Dockerfile-nojail.patch | |
| +++ containers/Dockerfile-nojail.patch | |
| @@ -53,7 +53,7 @@ | |
| 53 | "fossil", "server", \ |
| 54 | - "--chroot", "/jail", \ |
| 55 | "--create", \ |
| 56 | "--jsmode", "bundled", \ |
| 57 | "--user", "admin", \ |
| 58 | "museum/repo.fossil" ] |
| 59 | |
| 60 |