Fossil SCM
Updated the nojail patch so it applies cleanly atop all these recent Dockerfile changes. No functional change; merely tracks changes in the context parts of the diff.
Commit
2bdd5819e2f74137f56a34421d8f8caf274df27caaf6fc1124b3becb561240bf
Parent
591e3eb90edd73f…
1 file changed
+7
-7
| --- containers/Dockerfile-nojail.patch | ||
| +++ containers/Dockerfile-nojail.patch | ||
| @@ -1,27 +1,27 @@ | ||
| 1 | 1 | Index: Dockerfile |
| 2 | 2 | ================================================================== |
| 3 | 3 | --- Dockerfile |
| 4 | 4 | +++ Dockerfile |
| 5 | -@@ -62,13 +62,13 @@ | |
| 5 | +@@ -57,13 +57,13 @@ | |
| 6 | 6 | ## --------------------------------------------------------------------- |
| 7 | 7 | ## STAGE 2: Pare that back to the bare essentials. |
| 8 | 8 | ## --------------------------------------------------------------------- |
| 9 | 9 | |
| 10 | - FROM scratch | |
| 10 | + FROM scratch AS os | |
| 11 | 11 | -WORKDIR /jail |
| 12 | 12 | +WORKDIR / |
| 13 | 13 | ARG UID=499 |
| 14 | 14 | -ENV PATH "/bin:/usr/bin:/jail/bin" |
| 15 | 15 | +ENV PATH "/bin:/usr/bin" |
| 16 | 16 | |
| 17 | 17 | ### Lay BusyBox down as the first base layer. Coupled with the host's |
| 18 | - ### kernel, this is the "OS." | |
| 18 | + ### kernel, this is the "OS" used to RUN the subsequent setup script. | |
| 19 | 19 | COPY --from=builder /tmp/bbx/busybox /bin/ |
| 20 | - COPY --from=builder /etc/os-release /etc/ | |
| 21 | -@@ -84,19 +84,17 @@ | |
| 22 | - && adduser -S -h `pwd` -g 'Fossil User' -G fossil -u ${UID} fossil \ | |
| 20 | + RUN [ "/bin/busybox", "--install", "/bin" ] | |
| 21 | +@@ -78,19 +78,17 @@ | |
| 22 | + && echo "fossil:x:${UID}:fossil" >> /etc/group \ | |
| 23 | 23 | && install -d -m 700 -o fossil -g fossil log museum \ |
| 24 | 24 | && install -d -m 755 -o fossil -g fossil dev \ |
| 25 | 25 | && install -d -m 755 -o root -g root /usr/bin \ |
| 26 | 26 | && install -d -m 400 -o root -g root /run \ |
| 27 | 27 | - && install -d -m 1777 -o root -g root /tmp \ |
| @@ -39,11 +39,11 @@ | ||
| 39 | 39 | && echo -e '#!/bin/sh\nfossil sha1sum "$@"' > /usr/bin/sha1sum \ |
| 40 | 40 | && echo -e '#!/bin/sh\nfossil sha3sum "$@"' > /usr/bin/sha3sum \ |
| 41 | 41 | && echo -e '#!/bin/sh\nfossil sqlite3 --no-repository "$@"' > \ |
| 42 | 42 | /usr/bin/sqlite3 \ |
| 43 | 43 | && chmod +x /usr/bin/sha?sum /usr/bin/sqlite3 |
| 44 | -@@ -107,10 +105,9 @@ | |
| 44 | +@@ -101,10 +99,9 @@ | |
| 45 | 45 | ## --------------------------------------------------------------------- |
| 46 | 46 | |
| 47 | 47 | EXPOSE 8080/tcp |
| 48 | 48 | CMD [ \ |
| 49 | 49 | "fossil", "server", \ |
| 50 | 50 |
| --- containers/Dockerfile-nojail.patch | |
| +++ containers/Dockerfile-nojail.patch | |
| @@ -1,27 +1,27 @@ | |
| 1 | Index: Dockerfile |
| 2 | ================================================================== |
| 3 | --- Dockerfile |
| 4 | +++ Dockerfile |
| 5 | @@ -62,13 +62,13 @@ |
| 6 | ## --------------------------------------------------------------------- |
| 7 | ## STAGE 2: Pare that back to the bare essentials. |
| 8 | ## --------------------------------------------------------------------- |
| 9 | |
| 10 | FROM scratch |
| 11 | -WORKDIR /jail |
| 12 | +WORKDIR / |
| 13 | ARG UID=499 |
| 14 | -ENV PATH "/bin:/usr/bin:/jail/bin" |
| 15 | +ENV PATH "/bin:/usr/bin" |
| 16 | |
| 17 | ### Lay BusyBox down as the first base layer. Coupled with the host's |
| 18 | ### kernel, this is the "OS." |
| 19 | COPY --from=builder /tmp/bbx/busybox /bin/ |
| 20 | COPY --from=builder /etc/os-release /etc/ |
| 21 | @@ -84,19 +84,17 @@ |
| 22 | && adduser -S -h `pwd` -g 'Fossil User' -G fossil -u ${UID} fossil \ |
| 23 | && install -d -m 700 -o fossil -g fossil log museum \ |
| 24 | && install -d -m 755 -o fossil -g fossil dev \ |
| 25 | && install -d -m 755 -o root -g root /usr/bin \ |
| 26 | && install -d -m 400 -o root -g root /run \ |
| 27 | - && install -d -m 1777 -o root -g root /tmp \ |
| @@ -39,11 +39,11 @@ | |
| 39 | && echo -e '#!/bin/sh\nfossil sha1sum "$@"' > /usr/bin/sha1sum \ |
| 40 | && echo -e '#!/bin/sh\nfossil sha3sum "$@"' > /usr/bin/sha3sum \ |
| 41 | && echo -e '#!/bin/sh\nfossil sqlite3 --no-repository "$@"' > \ |
| 42 | /usr/bin/sqlite3 \ |
| 43 | && chmod +x /usr/bin/sha?sum /usr/bin/sqlite3 |
| 44 | @@ -107,10 +105,9 @@ |
| 45 | ## --------------------------------------------------------------------- |
| 46 | |
| 47 | EXPOSE 8080/tcp |
| 48 | CMD [ \ |
| 49 | "fossil", "server", \ |
| 50 |
| --- containers/Dockerfile-nojail.patch | |
| +++ containers/Dockerfile-nojail.patch | |
| @@ -1,27 +1,27 @@ | |
| 1 | Index: Dockerfile |
| 2 | ================================================================== |
| 3 | --- Dockerfile |
| 4 | +++ Dockerfile |
| 5 | @@ -57,13 +57,13 @@ |
| 6 | ## --------------------------------------------------------------------- |
| 7 | ## STAGE 2: Pare that back to the bare essentials. |
| 8 | ## --------------------------------------------------------------------- |
| 9 | |
| 10 | FROM scratch AS os |
| 11 | -WORKDIR /jail |
| 12 | +WORKDIR / |
| 13 | ARG UID=499 |
| 14 | -ENV PATH "/bin:/usr/bin:/jail/bin" |
| 15 | +ENV PATH "/bin:/usr/bin" |
| 16 | |
| 17 | ### Lay BusyBox down as the first base layer. Coupled with the host's |
| 18 | ### kernel, this is the "OS" used to RUN the subsequent setup script. |
| 19 | COPY --from=builder /tmp/bbx/busybox /bin/ |
| 20 | RUN [ "/bin/busybox", "--install", "/bin" ] |
| 21 | @@ -78,19 +78,17 @@ |
| 22 | && echo "fossil:x:${UID}:fossil" >> /etc/group \ |
| 23 | && install -d -m 700 -o fossil -g fossil log museum \ |
| 24 | && install -d -m 755 -o fossil -g fossil dev \ |
| 25 | && install -d -m 755 -o root -g root /usr/bin \ |
| 26 | && install -d -m 400 -o root -g root /run \ |
| 27 | - && install -d -m 1777 -o root -g root /tmp \ |
| @@ -39,11 +39,11 @@ | |
| 39 | && echo -e '#!/bin/sh\nfossil sha1sum "$@"' > /usr/bin/sha1sum \ |
| 40 | && echo -e '#!/bin/sh\nfossil sha3sum "$@"' > /usr/bin/sha3sum \ |
| 41 | && echo -e '#!/bin/sh\nfossil sqlite3 --no-repository "$@"' > \ |
| 42 | /usr/bin/sqlite3 \ |
| 43 | && chmod +x /usr/bin/sha?sum /usr/bin/sqlite3 |
| 44 | @@ -101,10 +99,9 @@ |
| 45 | ## --------------------------------------------------------------------- |
| 46 | |
| 47 | EXPOSE 8080/tcp |
| 48 | CMD [ \ |
| 49 | "fossil", "server", \ |
| 50 |