Skip to content

Commit 00aaa02

Browse files
jc21jc21
committed
Replace sqlite module with a non-cgo version. Removed usql from dev
1 parent a516643 commit 00aaa02

File tree

10 files changed

+74
-29
lines changed

10 files changed

+74
-29
lines changed

‎Jenkinsfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ pipeline {
172172
always {
173173
// Dumps to analyze later
174174
sh 'mkdir -p debug'
175-
sh 'docker logs $(docker-compose ps -q fullstack) > debug/docker_fullstack.log 2>&1'
176-
sh 'docker logs $(docker-compose ps -q stepca) > debug/docker_stepca.log 2>&1'
177-
sh 'docker logs $(docker-compose ps -q pdns) > debug/docker_pdns.log 2>&1'
178-
sh 'docker logs $(docker-compose ps -q pdns-db) > debug/docker_pdns-db.log 2>&1'
179-
sh 'docker logs $(docker-compose ps -q dnsrouter) > debug/docker_dnsrouter.log 2>&1'
175+
sh 'docker logs $(docker-compose ps --all -q fullstack) > debug/docker_fullstack.log 2>&1'
176+
sh 'docker logs $(docker-compose ps --all -q stepca) > debug/docker_stepca.log 2>&1'
177+
sh 'docker logs $(docker-compose ps --all -q pdns) > debug/docker_pdns.log 2>&1'
178+
sh 'docker logs $(docker-compose ps --all -q pdns-db) > debug/docker_pdns-db.log 2>&1'
179+
sh 'docker logs $(docker-compose ps --all -q dnsrouter) > debug/docker_dnsrouter.log 2>&1'
180180
junit 'test/results/junit/*'
181181
}
182182
}

‎backend/go.mod

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module npm
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/alexflint/go-arg v1.4.3
@@ -15,18 +15,21 @@ require (
1515
github.com/jc21/go-sse v0.0.0-20230307071053-2e6b1dbcb7ec
1616
github.com/jc21/jsref v0.0.0-20210608024405-a97debfc4760
1717
github.com/jmoiron/sqlx v1.3.5
18-
github.com/mattn/go-sqlite3 v1.14.16
1918
github.com/patrickmn/go-cache v2.1.0+incompatible
2019
github.com/qri-io/jsonschema v0.2.1
2120
github.com/rotisserie/eris v0.5.4
2221
github.com/stretchr/testify v1.7.0
2322
github.com/vrischmann/envconfig v1.3.0
2423
golang.org/x/crypto v0.5.0
24+
modernc.org/sqlite v1.21.1
2525
)
2626

2727
require (
2828
github.com/alexflint/go-scalar v1.2.0 // indirect
2929
github.com/davecgh/go-spew v1.1.1 // indirect
30+
github.com/dustin/go-humanize v1.0.0 // indirect
31+
github.com/google/uuid v1.3.0 // indirect
32+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
3033
github.com/lestrrat-go/jspointer v0.0.0-20181205001929-82fadba7561c // indirect
3134
github.com/lestrrat-go/option v1.0.1 // indirect
3235
github.com/lestrrat-go/pdebug/v3 v3.0.1 // indirect
@@ -36,7 +39,19 @@ require (
3639
github.com/pkg/errors v0.9.1 // indirect
3740
github.com/pmezard/go-difflib v1.0.0 // indirect
3841
github.com/qri-io/jsonpointer v0.1.1 // indirect
42+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
43+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
3944
golang.org/x/sys v0.4.0 // indirect
4045
golang.org/x/text v0.6.0 // indirect
46+
golang.org/x/tools v0.1.12 // indirect
4147
gopkg.in/yaml.v3 v3.0.1 // indirect
48+
lukechampine.com/uint128 v1.2.0 // indirect
49+
modernc.org/cc/v3 v3.40.0 // indirect
50+
modernc.org/ccgo/v3 v3.16.13 // indirect
51+
modernc.org/libc v1.22.3 // indirect
52+
modernc.org/mathutil v1.5.0 // indirect
53+
modernc.org/memory v1.5.0 // indirect
54+
modernc.org/opt v0.1.3 // indirect
55+
modernc.org/strutil v1.1.3 // indirect
56+
modernc.org/token v1.0.1 // indirect
4257
)

‎backend/go.sum

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
1313
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
1414
github.com/drexedam/gravatar v0.0.0-20210327211422-e94eea8c338e h1:2R8DvYLNr5DL25eWwpOdPno1eIbTNjJC0d7v8ti5cus=
1515
github.com/drexedam/gravatar v0.0.0-20210327211422-e94eea8c338e/go.mod h1:YjikoytuRI4q+GRd3xrOrKJN+Ayi2dwRomHLDDeMHfs=
16+
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
17+
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
1618
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
1719
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
1820
github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak=
@@ -27,18 +29,17 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI
2729
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
2830
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
2931
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
30-
github.com/jc21/go-sse v0.0.0-20230307004720-e0a2266806a8 h1:3zrxixsRpzrMXd/c6vUHaoIi9OqirEPxPe4Ydxn3jNU=
31-
github.com/jc21/go-sse v0.0.0-20230307004720-e0a2266806a8/go.mod h1:4v5Xmm0eYuaWqKJ63XUV5YfQPoxtId3DgDytbnWhi+s=
32-
github.com/jc21/go-sse v0.0.0-20230307015818-b2783ddda573 h1:aaRu9mFSjxNfbXWVe7MlarmuB0vcdTShXFbxjzHAseA=
33-
github.com/jc21/go-sse v0.0.0-20230307015818-b2783ddda573/go.mod h1:4v5Xmm0eYuaWqKJ63XUV5YfQPoxtId3DgDytbnWhi+s=
34-
github.com/jc21/go-sse v0.0.0-20230307041911-8ea9bdc44a58 h1:WSD0YdEuFPZHIe8hkAjxoAEWZnzieAiLg3zw28EVf80=
35-
github.com/jc21/go-sse v0.0.0-20230307041911-8ea9bdc44a58/go.mod h1:4v5Xmm0eYuaWqKJ63XUV5YfQPoxtId3DgDytbnWhi+s=
32+
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
33+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
34+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3635
github.com/jc21/go-sse v0.0.0-20230307071053-2e6b1dbcb7ec h1:KKntwkZlM2w/88QiDyAeZ4th8grqtituzMW8qyapYzc=
3736
github.com/jc21/go-sse v0.0.0-20230307071053-2e6b1dbcb7ec/go.mod h1:4v5Xmm0eYuaWqKJ63XUV5YfQPoxtId3DgDytbnWhi+s=
3837
github.com/jc21/jsref v0.0.0-20210608024405-a97debfc4760 h1:7wxq2DIgtO36KLrFz1RldysO0WVvcYsD49G9tyAs01k=
3938
github.com/jc21/jsref v0.0.0-20210608024405-a97debfc4760/go.mod h1:yIq2t51OJgVsdRlPY68NAnyVdBH0kYXxDTFtUxOap80=
4039
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
4140
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
41+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
42+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
4243
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4344
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
4445
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -68,7 +69,6 @@ github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPn
6869
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
6970
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
7071
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
71-
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
7272
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
7373
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
7474
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -84,6 +84,9 @@ github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH
8484
github.com/qri-io/jsonschema v0.2.1 h1:NNFoKms+kut6ABPf6xiKNM5214jzxAhDBrPHCJ97Wg0=
8585
github.com/qri-io/jsonschema v0.2.1/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI=
8686
github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
87+
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
88+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
89+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
8790
github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
8891
github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
8992
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
@@ -100,6 +103,8 @@ github.com/vrischmann/envconfig v1.3.0/go.mod h1:bbvxFYJdRSpXrhS63mBFtKJzkDiNkyA
100103
github.com/wacul/ptr v1.0.0/go.mod h1:BD0gjsZrCwtoR+yWDB9v2hQ8STlq9tT84qKfa+3txOc=
101104
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
102105
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
106+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
107+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
103108
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
104109
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
105110
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -111,6 +116,8 @@ golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
111116
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
112117
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
113118
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
119+
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
120+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
114121
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
115122
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
116123
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -121,3 +128,27 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
121128
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
122129
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
123130
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
131+
lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
132+
lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
133+
modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
134+
modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
135+
modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
136+
modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
137+
modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
138+
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
139+
modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY=
140+
modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw=
141+
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
142+
modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
143+
modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
144+
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
145+
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
146+
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
147+
modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU=
148+
modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI=
149+
modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
150+
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
151+
modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
152+
modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
153+
modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
154+
modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=

‎backend/internal/database/sqlite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/jmoiron/sqlx"
1111

1212
// Blank import for Sqlite
13-
_ "github.com/mattn/go-sqlite3"
13+
_ "modernc.org/sqlite"
1414
)
1515

1616
var dbInstance *sqlx.DB
@@ -39,7 +39,7 @@ func GetInstance() *sqlx.DB {
3939
func SqliteDB() *sqlx.DB {
4040
dbFile := fmt.Sprintf("%s/nginxproxymanager.db", config.Configuration.DataFolder)
4141
autocreate(dbFile)
42-
db, err := sqlx.Open("sqlite3", dbFile)
42+
db, err := sqlx.Open("sqlite", dbFile)
4343
if err != nil {
4444
logger.Error("SqliteError", err)
4545
return nil

‎docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG SENTRY_DSN
1818

1919
ENV BUILD_COMMIT="${BUILD_COMMIT:-dev}" \
2020
BUILD_VERSION="${BUILD_VERSION:-0.0.0}" \
21-
CGO_ENABLED=1 \
21+
CGO_ENABLED=0 \
2222
GO111MODULE=on \
2323
GOPRIVATE="${GOPRIVATE:-}" \
2424
GOPROXY="${GOPROXY:-}" \

‎docker/dev/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@ ENV GOPROXY=$GOPROXY \
1717
CERT_HOME=/data/.acme.sh/certs \
1818
LE_CONFIG_HOME=/data/.acme.sh/config \
1919
LE_WORKING_DIR=/data/.acme.sh \
20-
CGO_ENABLED=1 \
20+
CGO_ENABLED=0 \
2121
GO111MODULE=on
2222

2323
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
2424

25-
# usql, node, fail2ban
25+
# node, fail2ban
2626
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
2727
&& apt-get update \
2828
&& apt-get install -y --no-install-recommends nodejs vim dnsutils fail2ban \
2929
&& npm install --___location=global yarn \
3030
&& apt-get clean \
31-
&& rm -rf /var/lib/apt/lists/* /etc/fail2ban \
32-
&& go install github.com/xo/[email protected]
31+
&& rm -rf /var/lib/apt/lists/* /etc/fail2ban
3332

3433
# Task
3534
RUN cd /usr \

‎docker/docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# WARNING: This is a DEVELOPMENT docker-compose file used for development of the entire app, it should not be used for production.
2-
version: "3"
2+
version: "3.8"
33
services:
44

55
npm:

‎scripts/ci/build-backend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ "$BUILD_VERSION" = "" ]; then
2020
BUILD_VERSION=$(cat .version)
2121
fi
2222

23-
export CGO_ENABLED=1
23+
export CGO_ENABLED=0
2424
export GO111MODULE=on
2525

2626
echo -e "${BLUE}❯ ${GREEN}build-backend:${RESET}"

‎scripts/ci/fulltest-cypress

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ get_container_ip () {
2222
local container_name=$1
2323
local container
2424
local ip
25-
container=$(docker-compose ps -q "${container_name}" | tail -n1)
25+
container=$(docker-compose ps --all -q "${container_name}" | tail -n1)
2626
ip=$(docker inspect -f "{{.NetworkSettings.Networks.${NETWORK_NAME}.IPAddress}}" "$container")
2727
echo "$ip"
2828
}
@@ -32,7 +32,7 @@ get_container_aliases () {
3232
local container_name=$1
3333
local container
3434
local ip
35-
container=$(docker-compose ps -q "${container_name}" | tail -n1)
35+
container=$(docker-compose ps --all -q "${container_name}" | tail -n1)
3636
ip=$(docker inspect -f "{{.NetworkSettings.Networks.${NETWORK_NAME}.Aliases}}" "$container")
3737
echo "$ip"
3838
}
@@ -61,14 +61,14 @@ printf "nameserver %s\noptions ndots:0" "${DNSROUTER_IP}" > "${LOCAL_RESOLVE}"
6161
docker-compose up -d --remove-orphans fullstack stepca
6262

6363
# wait for main container to be healthy
64-
bash "$DIR/../wait-healthy" "$(docker-compose ps -q fullstack)" 120
64+
bash "$DIR/../wait-healthy" "$(docker-compose ps --all -q fullstack)" 120
6565

6666
# Run tests
6767
rm -rf "$DIR/../../test/results"
6868
docker-compose up cypress
6969

7070
# Get results
71-
docker cp -L "$(docker-compose ps -q cypress):/test/results" "$DIR/../../test/"
72-
docker cp -L "$(docker-compose ps -q fullstack):/data/logs" "$DIR/../../test/results/"
71+
docker cp -L "$(docker-compose ps --all -q cypress):/test/results" "$DIR/../../test/"
72+
docker cp -L "$(docker-compose ps --all -q fullstack):/data/logs" "$DIR/../../test/results/"
7373

7474
echo -e "${BLUE}❯ ${GREEN}Fullstack cypress testing complete${RESET}"

‎scripts/start-dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ get_container_ip () {
88
local container_name=$1
99
local container
1010
local ip
11-
container=$(docker-compose ps -q "${container_name}" | tail -n1)
11+
container=$(docker-compose ps --all -q "${container_name}" | tail -n1)
1212
ip=$(docker inspect -f "{{.NetworkSettings.Networks.npmdev_default.IPAddress}}" "$container")
1313
echo "$ip"
1414
}

0 commit comments

Comments
 (0)