Skip to content

Commit

Permalink
fix(setup): Bump setup images to alpine 3.14 with arch based on machi…
Browse files Browse the repository at this point in the history
…ne OS. (datahub-project#6612)

* fix(setup): Bump setup images to alpine 3.14 with arch based on machine OS.
  • Loading branch information
pedro93 authored Dec 9, 2022
1 parent 68e30d3 commit c93bdc5
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docker/datahub-frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3.14 AS base
FROM --platform=$BUILDPLATFORM alpine:3 AS base

RUN addgroup -S datahub && adduser -S datahub -G datahub

Expand Down
4 changes: 2 additions & 2 deletions docker/datahub-gms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3.14 AS base
FROM --platform=$BUILDPLATFORM alpine:3 AS base

ENV DOCKERIZE_VERSION v0.6.1

Expand All @@ -24,7 +24,7 @@ RUN apk --no-cache --update-cache --available upgrade \
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
&& curl -sS -L https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv

FROM --platform=$BUILDPLATFORM alpine:3.14 AS prod-build
FROM --platform=$BUILDPLATFORM alpine:3 AS prod-build

# Upgrade Alpine and base packages
RUN apk --no-cache --update-cache --available upgrade \
Expand Down
4 changes: 2 additions & 2 deletions docker/datahub-mae-consumer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3.14 AS base
FROM --platform=$BUILDPLATFORM alpine:3 AS base

ENV DOCKERIZE_VERSION v0.6.1

Expand All @@ -21,7 +21,7 @@ RUN apk --no-cache --update-cache --available upgrade \
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv

FROM --platform=$BUILDPLATFORM alpine:3.14.2 AS prod-build
FROM --platform=$BUILDPLATFORM alpine:3 AS prod-build

# Upgrade Alpine and base packages
RUN apk --no-cache --update-cache --available upgrade \
Expand Down
4 changes: 2 additions & 2 deletions docker/datahub-mce-consumer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3.14 AS base
FROM --platform=$BUILDPLATFORM alpine:3 AS base

ENV DOCKERIZE_VERSION v0.6.1

Expand All @@ -21,7 +21,7 @@ RUN apk --no-cache --update-cache --available upgrade \
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv

FROM --platform=$BUILDPLATFORM alpine:3.14.2 AS prod-build
FROM --platform=$BUILDPLATFORM alpine:3 AS prod-build

# Upgrade Alpine and base packages
RUN apk --no-cache --update-cache --available upgrade \
Expand Down
4 changes: 2 additions & 2 deletions docker/datahub-upgrade/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3.14 AS base
FROM --platform=$BUILDPLATFORM alpine:3 AS base
ENV DOCKERIZE_VERSION v0.6.1
# Upgrade Alpine and base packages
RUN apk --no-cache --update-cache --available upgrade \
Expand All @@ -22,7 +22,7 @@ RUN apk --no-cache --update-cache --available upgrade \
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv

FROM --platform=$BUILDPLATFORM alpine:3.14 AS prod-build
FROM --platform=$BUILDPLATFORM alpine:3 AS prod-build

# Upgrade Alpine and base packages
RUN apk --no-cache --update-cache --available upgrade \
Expand Down
2 changes: 1 addition & 1 deletion docker/elasticsearch-setup/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Defining environment
ARG APP_ENV=prod

FROM alpine:3 as base
FROM --platform=$BUILDPLATFORM alpine:3 AS base
ENV DOCKERIZE_VERSION v0.6.1
RUN apk add --no-cache curl jq tar bash coreutils \
&& curl -L https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
Expand Down
2 changes: 1 addition & 1 deletion docker/kafka-setup/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM confluentinc/cp-base-new:6.1.4 as confluent_base

# Based on https://github.com/blacktop's alpine kafka build
FROM python:3-alpine
FROM --platform=$BUILDPLATFORM python:3-alpine

ENV KAFKA_VERSION 2.8.2
ENV SCALA_VERSION 2.13
Expand Down
2 changes: 1 addition & 1 deletion docker/mysql-setup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3
FROM --platform=$BUILDPLATFORM alpine:3

ENV DOCKERIZE_VERSION v0.6.1
RUN apk add --no-cache mysql-client curl tar bash \
Expand Down
2 changes: 1 addition & 1 deletion docker/postgres-setup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3
FROM --platform=$BUILDPLATFORM alpine:3

ENV DOCKERIZE_VERSION v0.6.1
RUN apk add --no-cache postgresql-client curl tar \
Expand Down

0 comments on commit c93bdc5

Please sign in to comment.