Fossil SCM
Merge latest trunk
Commit
fef7e1f91141e9ee5fd6a36232d34c82480a676c
Parent
5f4e2db949690d1…
3 files changed
+2
-1
+2
-2
+2
-2
+2
-1
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -24,12 +24,13 @@ | ||
| 24 | 24 | |
| 25 | 25 | USER fossil |
| 26 | 26 | |
| 27 | 27 | ENV HOME /opt/fossil |
| 28 | 28 | |
| 29 | -RUN fossil new --empty -A admin /opt/fossil/repository.fossil | |
| 29 | +RUN fossil new --docker -A admin /opt/fossil/repository.fossil | |
| 30 | 30 | RUN fossil user password -R /opt/fossil/repository.fossil admin admin |
| 31 | 31 | RUN fossil cache init -R /opt/fossil/repository.fossil |
| 32 | 32 | |
| 33 | 33 | EXPOSE 8080 |
| 34 | 34 | |
| 35 | 35 | CMD ["/usr/bin/fossil", "server", "/opt/fossil/repository.fossil"] |
| 36 | + | |
| 36 | 37 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -24,12 +24,13 @@ | |
| 24 | |
| 25 | USER fossil |
| 26 | |
| 27 | ENV HOME /opt/fossil |
| 28 | |
| 29 | RUN fossil new --empty -A admin /opt/fossil/repository.fossil |
| 30 | RUN fossil user password -R /opt/fossil/repository.fossil admin admin |
| 31 | RUN fossil cache init -R /opt/fossil/repository.fossil |
| 32 | |
| 33 | EXPOSE 8080 |
| 34 | |
| 35 | CMD ["/usr/bin/fossil", "server", "/opt/fossil/repository.fossil"] |
| 36 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -24,12 +24,13 @@ | |
| 24 | |
| 25 | USER fossil |
| 26 | |
| 27 | ENV HOME /opt/fossil |
| 28 | |
| 29 | RUN fossil new --docker -A admin /opt/fossil/repository.fossil |
| 30 | RUN fossil user password -R /opt/fossil/repository.fossil admin admin |
| 31 | RUN fossil cache init -R /opt/fossil/repository.fossil |
| 32 | |
| 33 | EXPOSE 8080 |
| 34 | |
| 35 | CMD ["/usr/bin/fossil", "server", "/opt/fossil/repository.fossil"] |
| 36 | |
| 37 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1498,11 +1498,10 @@ | ||
| 1498 | 1498 | ** Options: |
| 1499 | 1499 | ** --template FILE copy settings from repository file |
| 1500 | 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | 1502 | ** (default: do not create an initial checkin) |
| 1503 | -** --empty create repository without project-id/server-id | |
| 1504 | 1503 | ** |
| 1505 | 1504 | ** See also: clone |
| 1506 | 1505 | */ |
| 1507 | 1506 | void create_repository_cmd(void){ |
| 1508 | 1507 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | ||
| 1512 | 1511 | int makeServerCodes; |
| 1513 | 1512 | |
| 1514 | 1513 | zTemplate = find_option("template",0,1); |
| 1515 | 1514 | zDate = find_option("date-override",0,1); |
| 1516 | 1515 | zDefaultUser = find_option("admin-user","A",1); |
| 1517 | - makeServerCodes = find_option("empty", 0, 0)==0; | |
| 1516 | + makeServerCodes = find_option("docker", 0, 0)==0; | |
| 1518 | 1517 | |
| 1518 | + find_option("empty", 0, 0); /* deprecated */ | |
| 1519 | 1519 | /* We should be done with options.. */ |
| 1520 | 1520 | verify_all_options(); |
| 1521 | 1521 | |
| 1522 | 1522 | if( g.argc!=3 ){ |
| 1523 | 1523 | usage("REPOSITORY-NAME"); |
| 1524 | 1524 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1498,11 +1498,10 @@ | |
| 1498 | ** Options: |
| 1499 | ** --template FILE copy settings from repository file |
| 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | ** (default: do not create an initial checkin) |
| 1503 | ** --empty create repository without project-id/server-id |
| 1504 | ** |
| 1505 | ** See also: clone |
| 1506 | */ |
| 1507 | void create_repository_cmd(void){ |
| 1508 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | |
| 1512 | int makeServerCodes; |
| 1513 | |
| 1514 | zTemplate = find_option("template",0,1); |
| 1515 | zDate = find_option("date-override",0,1); |
| 1516 | zDefaultUser = find_option("admin-user","A",1); |
| 1517 | makeServerCodes = find_option("empty", 0, 0)==0; |
| 1518 | |
| 1519 | /* We should be done with options.. */ |
| 1520 | verify_all_options(); |
| 1521 | |
| 1522 | if( g.argc!=3 ){ |
| 1523 | usage("REPOSITORY-NAME"); |
| 1524 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1498,11 +1498,10 @@ | |
| 1498 | ** Options: |
| 1499 | ** --template FILE copy settings from repository file |
| 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | ** (default: do not create an initial checkin) |
| 1503 | ** |
| 1504 | ** See also: clone |
| 1505 | */ |
| 1506 | void create_repository_cmd(void){ |
| 1507 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | |
| 1511 | int makeServerCodes; |
| 1512 | |
| 1513 | zTemplate = find_option("template",0,1); |
| 1514 | zDate = find_option("date-override",0,1); |
| 1515 | zDefaultUser = find_option("admin-user","A",1); |
| 1516 | makeServerCodes = find_option("docker", 0, 0)==0; |
| 1517 | |
| 1518 | find_option("empty", 0, 0); /* deprecated */ |
| 1519 | /* We should be done with options.. */ |
| 1520 | verify_all_options(); |
| 1521 | |
| 1522 | if( g.argc!=3 ){ |
| 1523 | usage("REPOSITORY-NAME"); |
| 1524 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1498,11 +1498,10 @@ | ||
| 1498 | 1498 | ** Options: |
| 1499 | 1499 | ** --template FILE copy settings from repository file |
| 1500 | 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | 1502 | ** (default: do not create an initial checkin) |
| 1503 | -** --empty create repository without project-id/server-id | |
| 1504 | 1503 | ** |
| 1505 | 1504 | ** See also: clone |
| 1506 | 1505 | */ |
| 1507 | 1506 | void create_repository_cmd(void){ |
| 1508 | 1507 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | ||
| 1512 | 1511 | int makeServerCodes; |
| 1513 | 1512 | |
| 1514 | 1513 | zTemplate = find_option("template",0,1); |
| 1515 | 1514 | zDate = find_option("date-override",0,1); |
| 1516 | 1515 | zDefaultUser = find_option("admin-user","A",1); |
| 1517 | - makeServerCodes = find_option("empty", 0, 0)==0; | |
| 1516 | + makeServerCodes = find_option("docker", 0, 0)==0; | |
| 1518 | 1517 | |
| 1518 | + find_option("empty", 0, 0); /* deprecated */ | |
| 1519 | 1519 | /* We should be done with options.. */ |
| 1520 | 1520 | verify_all_options(); |
| 1521 | 1521 | |
| 1522 | 1522 | if( g.argc!=3 ){ |
| 1523 | 1523 | usage("REPOSITORY-NAME"); |
| 1524 | 1524 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1498,11 +1498,10 @@ | |
| 1498 | ** Options: |
| 1499 | ** --template FILE copy settings from repository file |
| 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | ** (default: do not create an initial checkin) |
| 1503 | ** --empty create repository without project-id/server-id |
| 1504 | ** |
| 1505 | ** See also: clone |
| 1506 | */ |
| 1507 | void create_repository_cmd(void){ |
| 1508 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | |
| 1512 | int makeServerCodes; |
| 1513 | |
| 1514 | zTemplate = find_option("template",0,1); |
| 1515 | zDate = find_option("date-override",0,1); |
| 1516 | zDefaultUser = find_option("admin-user","A",1); |
| 1517 | makeServerCodes = find_option("empty", 0, 0)==0; |
| 1518 | |
| 1519 | /* We should be done with options.. */ |
| 1520 | verify_all_options(); |
| 1521 | |
| 1522 | if( g.argc!=3 ){ |
| 1523 | usage("REPOSITORY-NAME"); |
| 1524 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1498,11 +1498,10 @@ | |
| 1498 | ** Options: |
| 1499 | ** --template FILE copy settings from repository file |
| 1500 | ** --admin-user|-A USERNAME select given USERNAME as admin user |
| 1501 | ** --date-override DATETIME use DATETIME as time of the initial checkin |
| 1502 | ** (default: do not create an initial checkin) |
| 1503 | ** |
| 1504 | ** See also: clone |
| 1505 | */ |
| 1506 | void create_repository_cmd(void){ |
| 1507 | char *zPassword; |
| @@ -1512,12 +1511,13 @@ | |
| 1511 | int makeServerCodes; |
| 1512 | |
| 1513 | zTemplate = find_option("template",0,1); |
| 1514 | zDate = find_option("date-override",0,1); |
| 1515 | zDefaultUser = find_option("admin-user","A",1); |
| 1516 | makeServerCodes = find_option("docker", 0, 0)==0; |
| 1517 | |
| 1518 | find_option("empty", 0, 0); /* deprecated */ |
| 1519 | /* We should be done with options.. */ |
| 1520 | verify_all_options(); |
| 1521 | |
| 1522 | if( g.argc!=3 ){ |
| 1523 | usage("REPOSITORY-NAME"); |
| 1524 |