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.

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

Replace the source of container images with ECR gallery #110

Merged
merged 1 commit into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazonlinux:latest as builder
FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder

# Fluent Bit version; update these for each release
ENV FLB_VERSION 1.6.8
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN cp conf/parsers*.conf /fluent-bit/parsers/
ADD configs/parse-json.conf /fluent-bit/configs/
ADD configs/minimize-log-loss.conf /fluent-bit/configs/

FROM amazonlinux:latest
FROM public.ecr.aws/amazonlinux/amazonlinux:latest
RUN yum upgrade -y \
&& yum install -y openssl-devel \
cyrus-sasl-devel \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.plugins
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13
FROM public.ecr.aws/bitnami/golang:1.13
ENV GO111MODULE on
RUN go env -w GOPROXY=direct

Expand Down
2 changes: 1 addition & 1 deletion integ/clean_cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:latest
FROM public.ecr.aws/bitnami/python:3.7

RUN pip install boto3

Expand Down
4 changes: 3 additions & 1 deletion integ/emf_logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM bash:4.4
FROM public.ecr.aws/amazonlinux/amazonlinux:latest

RUN yum upgrade -y && yum install -y bash

COPY logscript.sh /

Expand Down
4 changes: 3 additions & 1 deletion integ/logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM bash:4.4
FROM public.ecr.aws/amazonlinux/amazonlinux:latest

RUN yum upgrade -y && yum install -y bash

COPY logscript.sh /

Expand Down
2 changes: 1 addition & 1 deletion integ/s3-logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazonlinux
FROM public.ecr.aws/amazonlinux/amazonlinux:latest

RUN yum upgrade -y
RUN yum install -y openssl
Expand Down
2 changes: 1 addition & 1 deletion integ/s3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Start from the latest golang base image
FROM golang:latest
FROM public.ecr.aws/bitnami/golang:1.13
ENV GOPROXY=direct

# Set the Current Working Directory inside the container
Expand Down
2 changes: 1 addition & 1 deletion integ/validate_cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:latest
FROM public.ecr.aws/bitnami/python:3.7

RUN pip install boto3

Expand Down