Skip to content

Commit

Permalink
[cherry-pick] Use node:14-alpine as base image (#552) (#558)
Browse files Browse the repository at this point in the history
/cherry-pick

Signed-off-by: Tamal Saha <tamal@appscode.com>

Co-authored-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
1gtm and tamalsaha committed Jan 16, 2021
1 parent c942e6d commit abd7a78
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile.dbg
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit abd7a78

Please sign in to comment.