[GHA] Default registry to dockerhub (#26448)

Makes local image building easier ### Tickets: - 149907
openvinotoolkit · Sep 5, 2024 · 22079ca · 22079ca
1 parent 9969f9f
commit 22079ca
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 18 deletions.
diff --git a/.github/actions/handle_docker/images_api.py b/.github/actions/handle_docker/images_api.py
@@ -62,6 +62,7 @@ def build(self, dry: bool = False, push: bool = True, docker_builder: str = None
         cmd = f"{build_cmd} " \
               f"--file {self.dockerfile} " \
               f"--tag {self.ref()} " \
+              f"--build-arg REGISTRY={self.registry}/dockerio " \
               f"{cache_cmd} " \
               f"{push_cmd} " \
               "."

diff --git a/.github/dockerfiles/docker_tag b/.github/dockerfiles/docker_tag
@@ -1 +1 @@
-pr-26086
+pr-26448
diff --git a/.github/dockerfiles/ov_build/debian_10_arm/Dockerfile b/.github/dockerfiles/ov_build/debian_10_arm/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerio/library/debian:10.13
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/debian:10.13
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/fedora_33/Dockerfile b/.github/dockerfiles/ov_build/fedora_33/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerio/library/fedora:33
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/fedora:33
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_20_04_arm64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:20.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:20.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_20_04_x64_nvidia/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_20_04_x64_nvidia/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/nvidia/cuda:11.8.0-runtime-ubuntu20.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/nvidia/cuda:11.8.0-runtime-ubuntu20.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_android/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_android/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64_dpcpp/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64_dpcpp/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64_nvidia/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64_nvidia/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/nvidia/cuda:11.8.0-runtime-ubuntu22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/nvidia/cuda:11.8.0-runtime-ubuntu22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:24.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:24.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_build/webassembly/Dockerfile b/.github/dockerfiles/ov_build/webassembly/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerio/emscripten/emsdk:3.1.61
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/emscripten/emsdk:3.1.61
 
 USER root
 

diff --git a/.github/dockerfiles/ov_test/ubuntu_20_04_arm64/Dockerfile b/.github/dockerfiles/ov_test/ubuntu_20_04_arm64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:20.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile b/.github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:20.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:22.04
 
 USER root
 

diff --git a/.github/dockerfiles/ov_test/ubuntu_24_04_x64/Dockerfile b/.github/dockerfiles/ov_test/ubuntu_24_04_x64/Dockerfile
@@ -1,4 +1,5 @@
-FROM openvinogithubactions.azurecr.io/dockerhub/ubuntu:24.04
+ARG REGISTRY="docker.io"
+FROM ${REGISTRY}/library/ubuntu:24.04
 
 USER root