Skip to content

Commit

Permalink
chore: Always utilise ECR for docker.io/library
Browse files Browse the repository at this point in the history
  • Loading branch information
PrivatePuffin committed Feb 8, 2025
1 parent a2633a6 commit dd05960
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/renovate/special/customVersioning.json5
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
{
"matchDatasources": ["docker"],
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-postgres-tomcat$",
"matchPackageNames": ["docker.io/library/xwiki"]
"matchPackageNames": ["public.ecr.aws/docker/library/xwiki"]
},
{
"matchDatasources": ["docker"],
Expand Down
2 changes: 1 addition & 1 deletion charts/stable/mongo-express/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
repository: docker.io/library/mongo-express
repository: public.ecr.aws/docker/library/mongo-express
pullPolicy: IfNotPresent
tag: latest@sha256:16ec1773958dcc4baa97c9256ef36cb537f6fa86343f4d8b2eb65e174bdd13c3
service:
Expand Down
2 changes: 1 addition & 1 deletion charts/stable/odoo/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
repository: docker.io/library/odoo
repository: public.ecr.aws/docker/library/odoo
pullPolicy: IfNotPresent
tag: 18.0@sha256:fb921bf251f2fc63d111529dec7d81488b3559f41c005302a46431df257eac29
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion charts/stable/xwiki/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
repository: docker.io/library/xwiki
repository: public.ecr.aws/docker/library/xwiki
tag: 17.0.0-postgres-tomcat@sha256:7e25b0aa7c6fb947d4c0dd23e539dc7ae3fd1038cefc611da11e920fb4a5fbfb
pullPolicy: IfNotPresent
service:
Expand Down
2 changes: 1 addition & 1 deletion clustertool/testdata/values_yaml/multiImageValues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dockerHub5Image:
tag: 1.0.0

dockerHub6Image:
repository: docker.io/library/image
repository: public.ecr.aws/docker/library/image
tag: 1.0.0

lscrImage:
Expand Down
2 changes: 1 addition & 1 deletion containers/apps/nextcloud-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/nextcloud:30.0.5-fpm@sha256:1654f68700a482a13feca52c3235b949d8771624d738c17e9c82e437fe5de5ec
FROM public.ecr.aws/docker/library/nextcloud:30.0.5-fpm@sha256:1654f68700a482a13feca52c3235b949d8771624d738c17e9c82e437fe5de5ec
# hadolint ignore=DL3008,DL3015,SC2086,SC2155,DL4006
RUN set -ex; \
\
Expand Down
4 changes: 2 additions & 2 deletions containers/apps/nextcloud-imaginary/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://github.com/nextcloud/all-in-one/tree/main/Containers/imaginary
FROM docker.io/library/golang:1.21.5-alpine3.17@sha256:92cb87af996ec6befc85f0aec27e12ead2fab396695fa8a7abff79e021e58195 as go
FROM public.ecr.aws/docker/library/golang:1.21.5-alpine3.17@sha256:92cb87af996ec6befc85f0aec27e12ead2fab396695fa8a7abff79e021e58195 as go

Check warning on line 2 in containers/apps/nextcloud-imaginary/Dockerfile

View workflow job for this annotation

GitHub Actions / Build (nextcloud-imaginary)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
# hadolint ignore=DL3018
RUN set -ex; \
apk add --no-cache \
Expand All @@ -11,7 +11,7 @@ RUN set -ex; \
vips-poppler; \
go install github.com/h2non/imaginary@b632dae8cc321452c3f85bcae79c580b1ae1ed84

FROM docker.io/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
FROM public.ecr.aws/docker/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099

# hadolint ignore=DL3018
RUN set -ex; \
Expand Down
2 changes: 1 addition & 1 deletion containers/apps/nextcloud-push-notify/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
FROM public.ecr.aws/docker/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099

SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
# hadolint ignore=DL3018
Expand Down
4 changes: 2 additions & 2 deletions containers/apps/traefik/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM docker.io/library/traefik:v3.3.3@sha256:f1fdee7fda041872cff24e36a08f45ca53f006ded88f743a8e30e3d87ca52b48
FROM public.ecr.aws/docker/library/traefik:v3.3.3@sha256:f1fdee7fda041872cff24e36a08f45ca53f006ded88f743a8e30e3d87ca52b48
# Above line used by CI to find tags etc

FROM docker.io/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099 as plugins
FROM public.ecr.aws/docker/library/alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099 as plugins

Check warning on line 4 in containers/apps/traefik/Dockerfile

View workflow job for this annotation

GitHub Actions / Build (traefik)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

# FIXME: Find a way to keep versions up to date
# -- Use the following prefixes to specify plugins to clone
Expand Down

0 comments on commit dd05960

Please sign in to comment.