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.

Sign up for GitHub

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

Update image registry of base container images from Dockerhub to ECR #4418

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Update image registry of base container images from Dockerhub to ECR #4418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions misc/certs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM debian:stable-20201012
FROM public.ecr.aws/docker/library/debian:stable-20240110-slim

RUN apt-get update && \
apt-get install -y ca-certificates && \
rm -rf /var/lib/apt/lists/*

# If anyone has a better idea for how to trim undesired certs or a better ca list to use, I'm all ears
RUN cp /etc/ca-certificates.conf /tmp/caconf && cat /tmp/caconf | \
grep -v "mozilla/CNNIC_ROOT\.crt" > /etc/ca-certificates.conf && \
update-ca-certificates --fresh
2 changes: 1 addition & 1 deletion misc/container-health/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
FROM busybox:1.32.0
FROM public.ecr.aws/docker/library/busybox:1.32.0
mye956 marked this conversation as resolved.
Show resolved Hide resolved

HEALTHCHECK --interval=1s --timeout=1s --retries=3 CMD echo hello

Expand Down
2 changes: 1 addition & 1 deletion misc/fluent-logger/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
ARG GO_VERSION
FROM golang:${GO_VERSION}
FROM public.ecr.aws/docker/library/golang:${GO_VERSION}

MAINTAINER Amazon Web Services, Inc.
COPY fluent-logger /
Expand Down
2 changes: 1 addition & 1 deletion misc/fluentd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM fluent/fluentd:v1.11.5-1.0
FROM public.ecr.aws/docker/library/fluentd:v1.14.0-1.0

COPY fluent.conf /fluentd/etc/
2 changes: 1 addition & 1 deletion misc/gremlin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
ARG GO_VERSION
FROM golang:${GO_VERSION} as build
FROM public.ecr.aws/docker/library/golang:${GO_VERSION} as build

WORKDIR /go/src/
ADD . /go/src/
Expand Down
2 changes: 1 addition & 1 deletion misc/netkitten/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
ARG GO_VERSION
FROM golang:${GO_VERSION} as build
FROM public.ecr.aws/docker/library/golang:${GO_VERSION}

WORKDIR /go/src/
ADD . /go/src/
Expand Down
2 changes: 1 addition & 1 deletion misc/pause-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
FROM gcc:7.3.0 as build
FROM public.ecr.aws/docker/library/gcc:11.2.0 as build

WORKDIR /src/
ADD . /src/
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# permissions and limitations under the License.

ARG GO_VERSION
FROM golang:${GO_VERSION}
FROM public.ecr.aws/docker/library/golang:${GO_VERSION}
MAINTAINER Amazon Web Services, Inc.

ENV XDG_CACHE_HOME /tmp
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.cleanbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# permissions and limitations under the License.

ARG GO_VERSION
FROM golang:${GO_VERSION}
FROM public.ecr.aws/docker/library/golang:${GO_VERSION}
MAINTAINER Amazon Web Services, Inc.

ENV XDG_CACHE_HOME /tmp
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/mock-agent.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and
# limitations under the License.

FROM busybox
FROM public.ecr.aws/docker/library/busybox

COPY scripts/mock-ecs-agent.sh /mock-ecs-agent.sh

Expand Down
Loading