Skip to content

Commit 3630e5c

Browse files
authored
Merge pull request #36 from mutablelogic/v12
Rebase to main
2 parents 38d18a1 + e882cae commit 3630e5c

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

etc/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ ARG ARCH
1616
ARG SOURCE
1717
RUN apt update && apt install -y ca-certificates
1818
COPY --from=builder /usr/src/app/build/* /usr/local/bin/
19-
COPY etc/entrypoint.sh .
20-
RUN chmod +x entrypoint.sh
19+
COPY --chmod=755 etc/entrypoint.sh .
2120

2221
# Install the api commands
2322
RUN api install

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ require (
1414
github.com/mutablelogic/go-server v1.4.7
1515
github.com/stretchr/testify v1.9.0
1616
github.com/xdg-go/pbkdf2 v1.0.0
17-
golang.org/x/crypto v0.23.0
17+
golang.org/x/crypto v0.31.0
1818
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
19-
golang.org/x/term v0.20.0
19+
golang.org/x/term v0.27.0
2020
)
2121

2222
require (
@@ -44,6 +44,6 @@ require (
4444
github.com/mattn/go-runewidth v0.0.15 // indirect
4545
github.com/pmezard/go-difflib v1.0.0 // indirect
4646
github.com/rivo/uniseg v0.4.7 // indirect
47-
golang.org/x/sys v0.20.0 // indirect
47+
golang.org/x/sys v0.28.0 // indirect
4848
gopkg.in/yaml.v3 v3.0.1 // indirect
4949
)

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
7474
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7575
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
7676
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
77+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
78+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
79+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
80+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
81+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
82+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
83+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
84+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
7785
golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
7886
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7987
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=

0 commit comments

Comments
 (0)