Skip to content

Commit

Permalink
Remove snapshot installer image for 2.8.0
Browse files Browse the repository at this point in the history
Signed-off-by: raihankhan <[email protected]>
  • Loading branch information
raihankhan committed Dec 8, 2023
1 parent 314370f commit 22db4d1
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 146 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ jobs:
cd elasticsearch-init
make release
# TODO: Add support for custom build image with necessary plugins installed
# - name: Build elasticsearch
# run: |
# cd elasticsearch
# make release

- name: Build elasticsearch-dashboard-init
run: |
cd elasticsearch-dashboard-init
Expand Down
22 changes: 9 additions & 13 deletions elasticsearch-dashboard-init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
FROM debian:bullseye as builder

# ref: https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
ARG TARGETOS
ARG TARGETARCH

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN true
FROM golang:1.21 AS yq

RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl unzip
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates

## build yq binary from ac-3.3.4 branch which has updated go dependencies
RUN set -x \
&& curl -fsSL -o yq https://github.com/mikefarah/yq/releases/download/3.3.0/yq_${TARGETOS}_${TARGETARCH} \
&& chmod 755 yq
&& git clone https://github.com/gomodules/yq.git \
&& cd yq \
&& git checkout ac-3.3.4 \
&& CGO_ENABLED=0 go build -v -o /yq yq.go

FROM {ELASTICSEARCH_DASHBOARD_IMAGE} as elasticsearch_dashboard

FROM alpine:3.13.1
FROM alpine:3.18.5

RUN apk add --no-cache bash
COPY scripts/dashboard-config-merger.sh /usr/local/bin/dashboard-config-merger.sh
COPY --from=builder /yq /usr/bin/yq
COPY --from=yq /yq /usr/bin/yq
COPY --from=elasticsearch_dashboard /usr/share/opensearch-dashboards/config /opensearch-dashboards/default-config

RUN chmod -c 755 /usr/local/bin/dashboard-config-merger.sh
Expand Down
23 changes: 10 additions & 13 deletions elasticsearch-init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
FROM debian:bullseye as builder

# ref: https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
ARG TARGETOS
ARG TARGETARCH

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN true
FROM golang:1.21 AS yq

RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl unzip
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates

## build yq binary from ac-3.3.4 branch which has updated go dependencies
RUN set -x \
&& curl -fsSL -o yq https://github.com/mikefarah/yq/releases/download/3.3.0/yq_${TARGETOS}_${TARGETARCH} \
&& chmod 755 yq
&& git clone https://github.com/gomodules/yq.git \
&& cd yq \
&& git checkout ac-3.3.4 \
&& CGO_ENABLED=0 go build -v -o /yq yq.go

FROM {ELASTICSEARCH_IMAGE} as elasticsearch
FROM alpine:3.13.1

FROM alpine:3.18.5

RUN apk add --no-cache bash
COPY scripts/config-merger.sh /usr/local/bin/config-merger.sh
COPY --from=builder /yq /usr/bin/yq
COPY --from=yq /yq /usr/bin/yq
COPY --from=elasticsearch /usr/share/opensearch/config /elasticsearch/default-config
COPY --from=elasticsearch /usr/share/opensearch/config/opensearch-security /elasticsearch/default-securityconfig

Expand Down
31 changes: 0 additions & 31 deletions elasticsearch/Dockerfile

This file was deleted.

82 changes: 0 additions & 82 deletions elasticsearch/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion elasticsearch/scripts

This file was deleted.

0 comments on commit 22db4d1

Please sign in to comment.