Skip to content

Commit

Permalink
Switch to debian image
Browse files Browse the repository at this point in the history
  • Loading branch information
jwierzbo committed Aug 25, 2024
1 parent 01066b9 commit a2d16ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG IMAGE=alpine:3.17
ARG IMAGE=debian:bullseye-slim
ARG ENVOY_IMAGE=envoyproxy/envoy:v1.31.0

# Build Steps
Expand All @@ -7,8 +7,6 @@ FROM ${ENVOY_IMAGE} AS envoy

FROM ${IMAGE} AS base

RUN apk upgrade --no-cache

FROM base

ARG VERSION
Expand All @@ -27,4 +25,6 @@ ARG TARGETARCH
ADD bin/${RELEASE_MODE}/linux/${TARGETARCH}/arangodb_operator /usr/bin/arangodb_operator
COPY --from=envoy /usr/local/bin/envoy /usr/local/bin/envoy

RUN /usr/local/bin/envoy --version

ENTRYPOINT [ "/usr/bin/arangodb_operator" ]
3 changes: 1 addition & 2 deletions pkg/deployment/resources/pod_creator.go
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,7 @@ func (r *Resources) RenderPodForMember(ctx context.Context, acs sutil.ACS, spec
cachedStatus: cache,
}
case api.ServerGroupTypeGateway:
// todo change me later
imageInfo.Image = "envoyproxy/envoy:v1.31-latest"
imageInfo.Image = r.context.GetOperatorImage()

podCreator = &MemberGatewayPod{
podName: podName,
Expand Down

0 comments on commit a2d16ec

Please sign in to comment.