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

Use fully qualified docker image names #3071

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
8 changes: 4 additions & 4 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG API_PY_VERSION
# Audio waveform #
##################

FROM realies/audiowaveform:latest AS awf
FROM docker.io/realies/audiowaveform:latest AS awf

# Identify dependencies of the `audiowaveform` binary and move them to `/deps`,
# while retaining their folder structure
Expand All @@ -18,7 +18,7 @@ RUN ldd /usr/local/bin/audiowaveform | tr -s '[:blank:]' '\n' | grep '^/' | \
# Python builder #
##################

FROM python:${API_PY_VERSION} AS builder
FROM docker.io/python:${API_PY_VERSION} AS builder

# Container optimizations
ENV PYTHONUNBUFFERED=1
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN pipenv install --system --deploy --dev
# API #
#######

FROM python:${API_PY_VERSION}-slim AS api
FROM docker.io/python:${API_PY_VERSION}-slim AS api

LABEL org.opencontainers.image.source="https://github.com/WordPress/openverse"

Expand Down Expand Up @@ -121,7 +121,7 @@ CMD ["gunicorn"]
# NGINX #
#########

FROM nginx:1.25.2-alpine as nginx
FROM docker.io/nginx:1.25.2-alpine as nginx

LABEL org.opencontainers.image.source = "https://github.com/WordPress/openverse"

Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
profiles:
- ingestion_server
- api
image: postgres:13.10-alpine
image: docker.io/postgres:13.10-alpine
ports:
- "50254:5432"
volumes:
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
profiles:
- catalog_dependencies
- catalog
image: minio/minio:latest
image: docker.io/minio/minio:latest
ports:
- "5010:5000"
- "5011:5001"
Expand All @@ -88,7 +88,7 @@ services:
profiles:
- catalog_dependencies
- catalog
image: minio/mc:latest
image: docker.io/minio/mc:latest
env_file:
- .env
- docker/minio/.env
Expand Down Expand Up @@ -145,7 +145,7 @@ services:
plausible_db:
profiles:
- frontend
image: postgres:13.10-alpine
image: docker.io/postgres:13.10-alpine
expose:
- "5432"
volumes:
Expand All @@ -158,7 +158,7 @@ services:
plausible_ch:
profiles:
- frontend
image: clickhouse/clickhouse-server:23.4-alpine
image: docker.io/clickhouse/clickhouse-server:23.4-alpine
volumes:
- plausible-clickhouse:/var/lib/clickhouse
- ./docker/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
Expand All @@ -184,7 +184,7 @@ services:
cache:
profiles:
- api
image: redis:4.0.14
image: docker.io/redis:4.0.14
ports:
- "50263:6379"

Expand Down Expand Up @@ -306,7 +306,7 @@ services:
proxy:
profiles:
- api
image: nginx:alpine
image: docker.io/nginx:alpine
ports:
- "50200:9080"
- "50243:9443"
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG FRONTEND_NODE_VERSION
# Node.js builder #
###################

FROM node:${FRONTEND_NODE_VERSION}-alpine as builder
FROM docker.io/node:${FRONTEND_NODE_VERSION}-alpine as builder

# Automatically use the right version of pnpm.
ARG FRONTEND_PNPM_VERSION
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN pnpm build:only
# Nuxt app #
############

FROM node:${FRONTEND_NODE_VERSION}-alpine as app
FROM docker.io/node:${FRONTEND_NODE_VERSION}-alpine as app

LABEL org.opencontainers.image.source="https://github.com/WordPress/openverse"

Expand Down
4 changes: 2 additions & 2 deletions ingestion_server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG INGESTION_PY_VERSION
# Python builder #
##################

FROM python:${INGESTION_PY_VERSION} as builder
FROM docker.io/python:${INGESTION_PY_VERSION} as builder

# Container optimizations
ENV PYTHONUNBUFFERED=1
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN pipenv install --system --deploy --dev
# Ingestion server #
####################

FROM python:${INGESTION_PY_VERSION}-slim as ing
FROM docker.io/python:${INGESTION_PY_VERSION}-slim as ing

LABEL org.opencontainers.image.source="https://github.com/WordPress/openverse"

Expand Down
2 changes: 1 addition & 1 deletion utilities/load_testing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM python:3.11-slim
FROM docker.io/python:3.11-slim

# See https://github.com/grafana/k6#linux
RUN apt-get update && \
Expand Down
Loading