From 1b1cfa8cc7800c9d212a34d1f74d7b8f99854ad0 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 2 Aug 2022 11:06:47 -0600 Subject: [PATCH] FIXME docs/docker-compose: Move to new containers/ dir the dir is not yet empty --- {beanstalk => containers/beanstalk}/alpine/Dockerfile | 0 .../postgres}/db/01-init.sh | 0 .../docker-compose => containers}/testnode/Dockerfile | 0 .../testnode/testnode_start.sh | 0 .../testnode/testnode_stop.sh | 0 .../testnode/testnode_sudoers | 0 .../teuthology-dev}/.teuthology.yaml | 0 .../teuthology-dev}/Dockerfile | 10 +++++----- .../teuthology-dev}/containerized_node.yaml | 0 .../teuthology-dev}/teuthology.sh | 0 10 files changed, 5 insertions(+), 5 deletions(-) rename {beanstalk => containers/beanstalk}/alpine/Dockerfile (100%) rename {docs/docker-compose => containers/postgres}/db/01-init.sh (100%) rename {docs/docker-compose => containers}/testnode/Dockerfile (100%) rename {docs/docker-compose => containers}/testnode/testnode_start.sh (100%) rename {docs/docker-compose => containers}/testnode/testnode_stop.sh (100%) rename {docs/docker-compose => containers}/testnode/testnode_sudoers (100%) rename {docs/docker-compose/teuthology => containers/teuthology-dev}/.teuthology.yaml (100%) rename {docs/docker-compose/teuthology => containers/teuthology-dev}/Dockerfile (72%) rename {docs/docker-compose/teuthology => containers/teuthology-dev}/containerized_node.yaml (100%) rename {docs/docker-compose/teuthology => containers/teuthology-dev}/teuthology.sh (100%) diff --git a/beanstalk/alpine/Dockerfile b/containers/beanstalk/alpine/Dockerfile similarity index 100% rename from beanstalk/alpine/Dockerfile rename to containers/beanstalk/alpine/Dockerfile diff --git a/docs/docker-compose/db/01-init.sh b/containers/postgres/db/01-init.sh similarity index 100% rename from docs/docker-compose/db/01-init.sh rename to containers/postgres/db/01-init.sh diff --git a/docs/docker-compose/testnode/Dockerfile b/containers/testnode/Dockerfile similarity index 100% rename from docs/docker-compose/testnode/Dockerfile rename to containers/testnode/Dockerfile diff --git a/docs/docker-compose/testnode/testnode_start.sh b/containers/testnode/testnode_start.sh similarity index 100% rename from docs/docker-compose/testnode/testnode_start.sh rename to containers/testnode/testnode_start.sh diff --git a/docs/docker-compose/testnode/testnode_stop.sh b/containers/testnode/testnode_stop.sh similarity index 100% rename from docs/docker-compose/testnode/testnode_stop.sh rename to containers/testnode/testnode_stop.sh diff --git a/docs/docker-compose/testnode/testnode_sudoers b/containers/testnode/testnode_sudoers similarity index 100% rename from docs/docker-compose/testnode/testnode_sudoers rename to containers/testnode/testnode_sudoers diff --git a/docs/docker-compose/teuthology/.teuthology.yaml b/containers/teuthology-dev/.teuthology.yaml similarity index 100% rename from docs/docker-compose/teuthology/.teuthology.yaml rename to containers/teuthology-dev/.teuthology.yaml diff --git a/docs/docker-compose/teuthology/Dockerfile b/containers/teuthology-dev/Dockerfile similarity index 72% rename from docs/docker-compose/teuthology/Dockerfile rename to containers/teuthology-dev/Dockerfile index 5587489d17..f350b31dbd 100644 --- a/docs/docker-compose/teuthology/Dockerfile +++ b/containers/teuthology-dev/Dockerfile @@ -28,12 +28,12 @@ RUN \ COPY . /teuthology RUN \ ./bootstrap -COPY docs/docker-compose/teuthology/containerized_node.yaml /teuthology -COPY docs/docker-compose/teuthology/.teuthology.yaml /root -COPY docs/docker-compose/teuthology/teuthology.sh / +COPY containers/teuthology-dev/containerized_node.yaml /teuthology +COPY containers/teuthology-dev/.teuthology.yaml /root +COPY containers/teuthology-dev/teuthology.sh / RUN mkdir -p /etc/ansible -COPY docs/docker-compose/teuthology/ansible_inventory/hosts /etc/ansible/ -COPY docs/docker-compose/teuthology/ansible_inventory/secrets /etc/ansible/ +COPY containers/teuthology-dev/ansible_inventory/hosts /etc/ansible/ +COPY containers/teuthology-dev/ansible_inventory/secrets /etc/ansible/ RUN \ mkdir $HOME/.ssh && \ touch $HOME/.ssh/${SSH_PRIVKEY_FILE} && \ diff --git a/docs/docker-compose/teuthology/containerized_node.yaml b/containers/teuthology-dev/containerized_node.yaml similarity index 100% rename from docs/docker-compose/teuthology/containerized_node.yaml rename to containers/teuthology-dev/containerized_node.yaml diff --git a/docs/docker-compose/teuthology/teuthology.sh b/containers/teuthology-dev/teuthology.sh similarity index 100% rename from docs/docker-compose/teuthology/teuthology.sh rename to containers/teuthology-dev/teuthology.sh -- 2.39.5