Fossil SCM
Merge from trunk.
Commit
f571ded3680063624a65c699b1e1561fd6ba4541
Parent
5bbf1ab3f5811a0…
2 files changed
+4
-3
+2
+4
-3
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -1,24 +1,25 @@ | ||
| 1 | 1 | ### |
| 2 | 2 | # Dockerfile for Fossil |
| 3 | 3 | ### |
| 4 | -FROM fedora:21 | |
| 4 | +FROM fedora:22 | |
| 5 | 5 | |
| 6 | 6 | ### Now install some additional parts we will need for the build |
| 7 | -RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil | |
| 7 | +RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil | |
| 8 | 8 | |
| 9 | 9 | ### If you want to build "release", change the next line accordingly. |
| 10 | 10 | ENV FOSSIL_INSTALL_VERSION trunk |
| 11 | 11 | |
| 12 | 12 | RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx |
| 13 | 13 | RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install |
| 14 | 14 | RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx |
| 15 | 15 | RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl |
| 16 | +RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c | |
| 16 | 17 | RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil |
| 17 | 18 | |
| 18 | 19 | ### Build is done, remove modules no longer needed |
| 19 | -RUN yum remove -y gcc make zlib-devel openssl-devel tar && yum clean all | |
| 20 | +RUN dnf remove -y gcc make zlib-devel openssl-devel tar && dnf clean all | |
| 20 | 21 | |
| 21 | 22 | USER fossil |
| 22 | 23 | |
| 23 | 24 | ENV HOME /opt/fossil |
| 24 | 25 | |
| 25 | 26 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -1,24 +1,25 @@ | |
| 1 | ### |
| 2 | # Dockerfile for Fossil |
| 3 | ### |
| 4 | FROM fedora:21 |
| 5 | |
| 6 | ### Now install some additional parts we will need for the build |
| 7 | RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil |
| 8 | |
| 9 | ### If you want to build "release", change the next line accordingly. |
| 10 | ENV FOSSIL_INSTALL_VERSION trunk |
| 11 | |
| 12 | RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx |
| 13 | RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install |
| 14 | RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx |
| 15 | RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl |
| 16 | RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil |
| 17 | |
| 18 | ### Build is done, remove modules no longer needed |
| 19 | RUN yum remove -y gcc make zlib-devel openssl-devel tar && yum clean all |
| 20 | |
| 21 | USER fossil |
| 22 | |
| 23 | ENV HOME /opt/fossil |
| 24 | |
| 25 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -1,24 +1,25 @@ | |
| 1 | ### |
| 2 | # Dockerfile for Fossil |
| 3 | ### |
| 4 | FROM fedora:22 |
| 5 | |
| 6 | ### Now install some additional parts we will need for the build |
| 7 | RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil |
| 8 | |
| 9 | ### If you want to build "release", change the next line accordingly. |
| 10 | ENV FOSSIL_INSTALL_VERSION trunk |
| 11 | |
| 12 | RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx |
| 13 | RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install |
| 14 | RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx |
| 15 | RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl |
| 16 | RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c |
| 17 | RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil |
| 18 | |
| 19 | ### Build is done, remove modules no longer needed |
| 20 | RUN dnf remove -y gcc make zlib-devel openssl-devel tar && dnf clean all |
| 21 | |
| 22 | USER fossil |
| 23 | |
| 24 | ENV HOME /opt/fossil |
| 25 | |
| 26 |
+2
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -16,10 +16,12 @@ | ||
| 16 | 16 | <nowiki>[string is]</nowiki> command in TH1. |
| 17 | 17 | * Update internal Unicode character tables, used in regular expression |
| 18 | 18 | handling, from version 7.0 to 8.0. |
| 19 | 19 | * Add the new [/help?cmd=amend|amend] command which is used to modify |
| 20 | 20 | tags of a "check-in". |
| 21 | + * Fix bug in [/help?cmd=import|import] command, handling version 3 of | |
| 22 | + the svndump format for subversion. | |
| 21 | 23 | |
| 22 | 24 | <h2>Changes for Version 1.33 (2015-05-23)</h2> |
| 23 | 25 | * Improved fork detection on [/help?cmd=update|fossil update], |
| 24 | 26 | [/help?cmd=status|fossil status] and related commands. |
| 25 | 27 | * Change the default skin to what used to be called "San Francisco Modern". |
| 26 | 28 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -16,10 +16,12 @@ | |
| 16 | <nowiki>[string is]</nowiki> command in TH1. |
| 17 | * Update internal Unicode character tables, used in regular expression |
| 18 | handling, from version 7.0 to 8.0. |
| 19 | * Add the new [/help?cmd=amend|amend] command which is used to modify |
| 20 | tags of a "check-in". |
| 21 | |
| 22 | <h2>Changes for Version 1.33 (2015-05-23)</h2> |
| 23 | * Improved fork detection on [/help?cmd=update|fossil update], |
| 24 | [/help?cmd=status|fossil status] and related commands. |
| 25 | * Change the default skin to what used to be called "San Francisco Modern". |
| 26 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -16,10 +16,12 @@ | |
| 16 | <nowiki>[string is]</nowiki> command in TH1. |
| 17 | * Update internal Unicode character tables, used in regular expression |
| 18 | handling, from version 7.0 to 8.0. |
| 19 | * Add the new [/help?cmd=amend|amend] command which is used to modify |
| 20 | tags of a "check-in". |
| 21 | * Fix bug in [/help?cmd=import|import] command, handling version 3 of |
| 22 | the svndump format for subversion. |
| 23 | |
| 24 | <h2>Changes for Version 1.33 (2015-05-23)</h2> |
| 25 | * Improved fork detection on [/help?cmd=update|fossil update], |
| 26 | [/help?cmd=status|fossil status] and related commands. |
| 27 | * Change the default skin to what used to be called "San Francisco Modern". |
| 28 |