fix: remove NODE_OPTIONS openssl workaround
This commit is contained in:
parent
fd9e6874ea
commit
6215a2c69a
3
Makefile
3
Makefile
|
|
@ -12,7 +12,6 @@ DOCKER_WORKDIR=/proj
|
||||||
DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR}
|
DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR}
|
||||||
DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS"
|
DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS"
|
||||||
DOCKER_TEST_LEVEL ?= 0 # Optionally run a test during docker build
|
DOCKER_TEST_LEVEL ?= 0 # Optionally run a test during docker build
|
||||||
NODE_OPTIONS=$(shell if node --help | grep -q -- "--openssl-legacy-provider"; then echo --openssl-legacy-provider; fi)
|
|
||||||
|
|
||||||
test: test-coverage test-js
|
test: test-coverage test-js
|
||||||
check: check-go check-swagger check-js
|
check: check-go check-swagger check-js
|
||||||
|
|
@ -116,7 +115,7 @@ _build_within_docker:
|
||||||
${DOCKER_GO_BUILD} -o ${OUTPUT}
|
${DOCKER_GO_BUILD} -o ${OUTPUT}
|
||||||
|
|
||||||
build-js:
|
build-js:
|
||||||
(cd ui && NODE_OPTIONS="${NODE_OPTIONS}" yarn build)
|
(cd ui && yarn build)
|
||||||
|
|
||||||
build-linux-amd64:
|
build-linux-amd64:
|
||||||
${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 make _build_within_docker OUTPUT=${BUILD_DIR}/gotify-linux-amd64
|
${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 make _build_within_docker OUTPUT=${BUILD_DIR}/gotify-linux-amd64
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue