Attempt to make the asn1 patch work in docker (#4695)
Assumption is that there is write access without sudo, as running `sudo patch …` causes the following error: ``` #26 0.112 sudo patch -N -t -d /usr/local/go/src/vendor/golang.org/x/crypto/cryptobyte -i /build/patch/asn1.diff 289 #26 0.112 make: sudo: No such file or directory ```
This commit is contained in:
parent
967de7635d
commit
de1a4058f9
2 changed files with 7 additions and 1 deletions
|
|
@ -42,7 +42,7 @@ RUN go mod download
|
|||
|
||||
# prepare
|
||||
COPY . .
|
||||
RUN make patch-asn1
|
||||
RUN make patch-asn1-docker
|
||||
RUN make assets
|
||||
|
||||
# copy ui
|
||||
|
|
|
|||
6
Makefile
6
Makefile
|
|
@ -135,3 +135,9 @@ patch-asn1::
|
|||
cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
|
||||
sudo patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff
|
||||
cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
|
||||
|
||||
patch-asn1-docker::
|
||||
# echo $(GOROOT)
|
||||
cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
|
||||
patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff
|
||||
cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue