Skip to content

Commit 18612c3

Browse files
author
Emruz Hossain
committed
Added all
Signed-off-by: Emruz Hossain <emruz@appscode.com>
1 parent eadc54a commit 18612c3

24 files changed

+171
-257
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313

1414
# Dependency directories (remove the comment below to include it)
1515
# vendor/
16+
.go/
17+
bin/

Dockerfile.dbg

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,10 @@ RUN set -x
3030

3131
FROM {ARG_FROM}
3232

33-
LABEL org.opencontainers.image.source https://github.com/stashed/elasticsearch
34-
35-
RUN set -x \
36-
&& apk add --update --no-cache bash ca-certificates curl git
37-
38-
# Use forked version of elasticsearch-dump.
39-
# It fixes NOT_FOUND error when Elasticsearch returns 404 response code.
40-
# Ref: https://github.com/stashed/elasticsearch-dump/commit/88ffff07568743344dcfed9f51c45921e6712e2d
41-
RUN npm config set unsafe-perm true \
42-
&& npm install -g https://github.com/stashed/elasticsearch-dump#88ffff07568743344dcfed9f51c45921e6712e2d
33+
LABEL org.opencontainers.image.source https://github.com/stashed/manifest-backup
4334

4435
COPY --from=0 restic /bin/restic
4536
COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
37+
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
4638

4739
ENTRYPOINT ["/{ARG_BIN}"]

Dockerfile.in

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,11 @@ RUN set -x
3030

3131
FROM {ARG_FROM}
3232

33-
LABEL org.opencontainers.image.source https://github.com/stashed/elasticsearch
34-
35-
RUN set -x \
36-
&& apk add --update --no-cache bash ca-certificates curl git
37-
38-
# Use forked version of elasticsearch-dump.
39-
# It fixes NOT_FOUND error when Elasticsearch returns 404 response code.
40-
# Ref: https://github.com/stashed/elasticsearch-dump/commit/88ffff07568743344dcfed9f51c45921e6712e2d
41-
RUN npm config set unsafe-perm true \
42-
&& npm install -g https://github.com/stashed/elasticsearch-dump#88ffff07568743344dcfed9f51c45921e6712e2d
33+
LABEL org.opencontainers.image.source https://github.com/stashed/manifest-backup
4334

4435
COPY --from=0 /restic /bin/restic
4536
COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
37+
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
4638

4739
USER nobody
4840

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS)
5959
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
6060
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6161

62-
BASEIMAGE_PROD ?= node:16-alpine
63-
BASEIMAGE_DBG ?= node:16-alpine
62+
BASEIMAGE_PROD ?= busybox:latest
63+
BASEIMAGE_DBG ?= debian:bullseye
6464

6565
IMAGE := $(REGISTRY)/$(BIN)
6666
VERSION_PROD := $(VERSION)

bin/.container-appscodeci_stash-elasticsearch-7.14.0_linux_amd64-DBG

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/.container-appscodeci_stash-elasticsearch-7.14.0_linux_amd64-PROD

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/.container-appscodeci_stash-elasticsearch-7.3.2-139-g43cd255a_linux_amd64-DBG

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/.container-appscodeci_stash-elasticsearch-7.3.2-139-g43cd255a_linux_amd64-PROD

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/.dockerfile-DBG-linux_amd64

Lines changed: 0 additions & 47 deletions
This file was deleted.

bin/.dockerfile-PROD-linux_amd64

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)