Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cherry-pick] Use node:14-alpine as base image (#552) #558

Merged
merged 1 commit into from
Jan 16, 2021
Merged

[cherry-pick] Use node:14-alpine as base image (#552) #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile.dbg
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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