Fossil SCM

Minor fixes to the Docker container build process

wyoung 2022-08-16 09:39 trunk
Commit 454397b0cd891a6aa55dc088d4d8702e32f1f95106e9f83b30c6f9359e937852
Parent 2f67bf941af4dbf…
2 files changed +1 -1 +5 -5
~ Makefile.in ~ tools/busybox-config
M Makefile.in
+1 -1
--- Makefile.in
+++ Makefile.in
@@ -121,11 +121,11 @@
121121
122122
 # Container stuff
123123
 container-image: @srcdir@/Dockerfile
124124
 docker build -t fossil:@FOSSIL_CI_PFX@ $(DBFLAGS) @srcdir@
125125
126
-container-run: container
126
+container-run: container-image
127127
 docker run --name fossil-@FOSSIL_CI_PFX@ $(DRFLAGS) fossil:@FOSSIL_CI_PFX@
128128
129129
 @srcdir@/Dockerfile: @srcdir@/Dockerfile.in @srcdir@/manifest.uuid
130130
 @AUTOREMAKE@
131131
132132
--- Makefile.in
+++ Makefile.in
@@ -121,11 +121,11 @@
121
122 # Container stuff
123 container-image: @srcdir@/Dockerfile
124 docker build -t fossil:@FOSSIL_CI_PFX@ $(DBFLAGS) @srcdir@
125
126 container-run: container
127 docker run --name fossil-@FOSSIL_CI_PFX@ $(DRFLAGS) fossil:@FOSSIL_CI_PFX@
128
129 @srcdir@/Dockerfile: @srcdir@/Dockerfile.in @srcdir@/manifest.uuid
130 @AUTOREMAKE@
131
132
--- Makefile.in
+++ Makefile.in
@@ -121,11 +121,11 @@
121
122 # Container stuff
123 container-image: @srcdir@/Dockerfile
124 docker build -t fossil:@FOSSIL_CI_PFX@ $(DBFLAGS) @srcdir@
125
126 container-run: container-image
127 docker run --name fossil-@FOSSIL_CI_PFX@ $(DRFLAGS) fossil:@FOSSIL_CI_PFX@
128
129 @srcdir@/Dockerfile: @srcdir@/Dockerfile.in @srcdir@/manifest.uuid
130 @AUTOREMAKE@
131
132
M tools/busybox-config
+5 -5
--- tools/busybox-config
+++ tools/busybox-config
@@ -1,9 +1,9 @@
11
 #
22
 # Automatically generated make config: don't edit
3
-# Busybox version: 1.36.0.git
4
-# Mon Aug 15 05:49:48 2022
3
+# Busybox version: 1.35.0
4
+# Tue Aug 16 02:15:21 2022
55
 #
66
 CONFIG_HAVE_DOT_CONFIG=y
77
88
 #
99
 # Settings
@@ -417,11 +417,11 @@
417417
 # CONFIG_FEATURE_VI_8BIT is not set
418418
 CONFIG_FEATURE_VI_COLON=y
419419
 CONFIG_FEATURE_VI_COLON_EXPAND=y
420420
 CONFIG_FEATURE_VI_YANKMARK=y
421421
 CONFIG_FEATURE_VI_SEARCH=y
422
-CONFIG_FEATURE_VI_REGEX_SEARCH=n
422
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
423423
 CONFIG_FEATURE_VI_USE_SIGNALS=y
424424
 CONFIG_FEATURE_VI_DOT_CMD=y
425425
 CONFIG_FEATURE_VI_READONLY=y
426426
 CONFIG_FEATURE_VI_SETOPTS=y
427427
 CONFIG_FEATURE_VI_SET=y
@@ -880,11 +880,11 @@
880880
 # CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
881881
 # CONFIG_FEATURE_HTTPD_DATE is not set
882882
 # CONFIG_FEATURE_HTTPD_ACL_IP is not set
883883
 CONFIG_IFCONFIG=y
884884
 CONFIG_FEATURE_IFCONFIG_STATUS=y
885
-CONFIG_FEATURE_IFCONFIG_SLIP=n
885
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
886886
 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
887887
 CONFIG_FEATURE_IFCONFIG_HW=y
888888
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
889889
 # CONFIG_IFENSLAVE is not set
890890
 # CONFIG_IFPLUGD is not set
@@ -1034,11 +1034,11 @@
10341034
 CONFIG_FREE=y
10351035
 CONFIG_FUSER=y
10361036
 CONFIG_IOSTAT=y
10371037
 CONFIG_KILL=y
10381038
 CONFIG_KILLALL=y
1039
-CONFIG_KILLALL5=n
1039
+# CONFIG_KILLALL5 is not set
10401040
 CONFIG_LSOF=y
10411041
 CONFIG_MPSTAT=y
10421042
 CONFIG_NMETER=y
10431043
 CONFIG_PGREP=y
10441044
 CONFIG_PKILL=y
10451045
--- tools/busybox-config
+++ tools/busybox-config
@@ -1,9 +1,9 @@
1 #
2 # Automatically generated make config: don't edit
3 # Busybox version: 1.36.0.git
4 # Mon Aug 15 05:49:48 2022
5 #
6 CONFIG_HAVE_DOT_CONFIG=y
7
8 #
9 # Settings
@@ -417,11 +417,11 @@
417 # CONFIG_FEATURE_VI_8BIT is not set
418 CONFIG_FEATURE_VI_COLON=y
419 CONFIG_FEATURE_VI_COLON_EXPAND=y
420 CONFIG_FEATURE_VI_YANKMARK=y
421 CONFIG_FEATURE_VI_SEARCH=y
422 CONFIG_FEATURE_VI_REGEX_SEARCH=n
423 CONFIG_FEATURE_VI_USE_SIGNALS=y
424 CONFIG_FEATURE_VI_DOT_CMD=y
425 CONFIG_FEATURE_VI_READONLY=y
426 CONFIG_FEATURE_VI_SETOPTS=y
427 CONFIG_FEATURE_VI_SET=y
@@ -880,11 +880,11 @@
880 # CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
881 # CONFIG_FEATURE_HTTPD_DATE is not set
882 # CONFIG_FEATURE_HTTPD_ACL_IP is not set
883 CONFIG_IFCONFIG=y
884 CONFIG_FEATURE_IFCONFIG_STATUS=y
885 CONFIG_FEATURE_IFCONFIG_SLIP=n
886 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
887 CONFIG_FEATURE_IFCONFIG_HW=y
888 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
889 # CONFIG_IFENSLAVE is not set
890 # CONFIG_IFPLUGD is not set
@@ -1034,11 +1034,11 @@
1034 CONFIG_FREE=y
1035 CONFIG_FUSER=y
1036 CONFIG_IOSTAT=y
1037 CONFIG_KILL=y
1038 CONFIG_KILLALL=y
1039 CONFIG_KILLALL5=n
1040 CONFIG_LSOF=y
1041 CONFIG_MPSTAT=y
1042 CONFIG_NMETER=y
1043 CONFIG_PGREP=y
1044 CONFIG_PKILL=y
1045
--- tools/busybox-config
+++ tools/busybox-config
@@ -1,9 +1,9 @@
1 #
2 # Automatically generated make config: don't edit
3 # Busybox version: 1.35.0
4 # Tue Aug 16 02:15:21 2022
5 #
6 CONFIG_HAVE_DOT_CONFIG=y
7
8 #
9 # Settings
@@ -417,11 +417,11 @@
417 # CONFIG_FEATURE_VI_8BIT is not set
418 CONFIG_FEATURE_VI_COLON=y
419 CONFIG_FEATURE_VI_COLON_EXPAND=y
420 CONFIG_FEATURE_VI_YANKMARK=y
421 CONFIG_FEATURE_VI_SEARCH=y
422 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
423 CONFIG_FEATURE_VI_USE_SIGNALS=y
424 CONFIG_FEATURE_VI_DOT_CMD=y
425 CONFIG_FEATURE_VI_READONLY=y
426 CONFIG_FEATURE_VI_SETOPTS=y
427 CONFIG_FEATURE_VI_SET=y
@@ -880,11 +880,11 @@
880 # CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
881 # CONFIG_FEATURE_HTTPD_DATE is not set
882 # CONFIG_FEATURE_HTTPD_ACL_IP is not set
883 CONFIG_IFCONFIG=y
884 CONFIG_FEATURE_IFCONFIG_STATUS=y
885 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
886 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
887 CONFIG_FEATURE_IFCONFIG_HW=y
888 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
889 # CONFIG_IFENSLAVE is not set
890 # CONFIG_IFPLUGD is not set
@@ -1034,11 +1034,11 @@
1034 CONFIG_FREE=y
1035 CONFIG_FUSER=y
1036 CONFIG_IOSTAT=y
1037 CONFIG_KILL=y
1038 CONFIG_KILLALL=y
1039 # CONFIG_KILLALL5 is not set
1040 CONFIG_LSOF=y
1041 CONFIG_MPSTAT=y
1042 CONFIG_NMETER=y
1043 CONFIG_PGREP=y
1044 CONFIG_PKILL=y
1045

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button