diff --git a/Dockerfile.dbg b/Dockerfile.dbg index e6ee189ef..88ba2f722 100644 --- a/Dockerfile.dbg +++ b/Dockerfile.dbg @@ -35,7 +35,8 @@ LABEL org.opencontainers.image.source https://github.com/stashed/elasticsearch RUN set -x \ && apk add --update --no-cache bash ca-certificates curl -RUN npm install elasticdump@6.62.1 -g +RUN npm config set unsafe-perm true \ + && npm install elasticdump@6.62.1 -g COPY --from=0 restic /bin/restic COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN} diff --git a/Dockerfile.in b/Dockerfile.in index daa0b19d8..dcd399308 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -35,7 +35,8 @@ LABEL org.opencontainers.image.source https://github.com/stashed/elasticsearch RUN set -x \ && apk add --update --no-cache bash ca-certificates curl -RUN npm install elasticdump@6.62.1 -g +RUN npm config set unsafe-perm true \ + && npm install elasticdump@6.62.1 -g COPY --from=0 /restic /bin/restic COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN} diff --git a/Makefile b/Makefile index 406f40ed6..10efd6232 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) -BASEIMAGE_PROD ?= node:10-alpine -BASEIMAGE_DBG ?= node:10-alpine +BASEIMAGE_PROD ?= node:14-alpine +BASEIMAGE_DBG ?= node:14-alpine IMAGE := $(REGISTRY)/$(BIN) VERSION_PROD := $(VERSION)