Move Dockerfiles in a top folder to be used by both CI

Signed-off-by: Benoit Donneaux <[email protected]>
LeastAuthority · Nov 27, 2024 · 533f5e9 · 533f5e9
1 parent c7df8e9
commit 533f5e9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -632,7 +632,7 @@ jobs:
                 --build-arg TAG=${TAG} \
                 --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
                 -t tahoelafsci/${DISTRO}:${TAG}-py${PYTHON_VERSION} \
-                -f ~/project/.circleci/Dockerfile.${DISTRO} \
+                -f ~/project/docker/${DISTRO}/Dockerfile \
                 ~/project/
       - run:
           name: "Push image"

diff --git a/.circleci/Dockerfile.debian → docker/debian/Dockerfile b/.circleci/Dockerfile.debian → docker/debian/Dockerfile
diff --git a/.circleci/Dockerfile.fedora → docker/fedora/Dockerfile b/.circleci/Dockerfile.fedora → docker/fedora/Dockerfile
diff --git a/.circleci/Dockerfile.oraclelinux → docker/oraclelinux/Dockerfile b/.circleci/Dockerfile.oraclelinux → docker/oraclelinux/Dockerfile
diff --git a/.circleci/Dockerfile.ubuntu → docker/ubuntu/Dockerfile b/.circleci/Dockerfile.ubuntu → docker/ubuntu/Dockerfile