diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3d2c2b7fb..13668c2c3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,9 +16,9 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build docker image run: | - ./docker/build.sh - docker-compose -f docker/staging/docker-compose.yml up --exit-code-from client client - docker-compose -f docker/staging/docker-compose.yml down + ./dockerfiles/build.sh + docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client + docker-compose -f dockerfiles/staging/docker-compose.yml down docker images docker tag labgrid-client ${{ secrets.DOCKERHUB_PREFIX }}client docker tag labgrid-exporter ${{ secrets.DOCKERHUB_PREFIX }}exporter diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 3f0d20eb2..cb8feacc1 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -65,9 +65,9 @@ jobs: - uses: actions/checkout@v2 - name: Build docker images run: | - ./docker/build.sh - docker-compose -f docker/staging/docker-compose.yml up --exit-code-from client client - docker-compose -f docker/staging/docker-compose.yml down + ./dockerfiles/build.sh + docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client + docker-compose -f dockerfiles/staging/docker-compose.yml down - name: Show docker images run: | docker images diff --git a/.gitignore b/.gitignore index 699a165db..84192a924 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,6 @@ /dist /.pytest_cache/ /htmlcov/ -/docker/staging/crossbar/* -!/docker/staging/crossbar/places_example.yaml +/dockerfiles/staging/crossbar/* +!/dockerfiles/staging/crossbar/places_example.yaml /.idea diff --git a/.travis.yml b/.travis.yml index f498a710e..a6a21377c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ matrix: services: - docker script: - - ./docker/build.sh - - docker-compose -f docker/staging/docker-compose.yml up --exit-code-from client client - - docker-compose -f docker/staging/docker-compose.yml down + - ./dockerfiles/build.sh + - docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client + - docker-compose -f dockerfiles/staging/docker-compose.yml down - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$DOCKER_USERNAME" != "" ] && [ "$DOCKER_TOKEN" != "" ]; then echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin; docker images; diff --git a/CODEOWNERS b/CODEOWNERS index 6238244aa..5f33354ba 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -/docker/ @krevsbech +/dockerfiles/ @krevsbech diff --git a/docker/README.rst b/dockerfiles/README.rst similarity index 95% rename from docker/README.rst rename to dockerfiles/README.rst index d556211b4..b32fce53d 100644 --- a/docker/README.rst +++ b/dockerfiles/README.rst @@ -22,7 +22,7 @@ Example showing how to build labgrid-client image: .. code-block:: bash - $ docker build -t labgrid-client -f docker/client/Dockerfile . + $ dockerfiles build -t labgrid-client -f dockerfiles/client/Dockerfilesfile . You can also choose to build all 3 images, with the included script @@ -30,7 +30,7 @@ with the included script .. code-block:: bash - $ ./docker/build.sh + $ ./dockerfiles/build.sh Usage @@ -119,13 +119,13 @@ To use the staging environment to conduct a smoke test first build the images as .. code-block:: bash - $ ./docker/build.sh + $ ./dockerfiles/build.sh Then use docker compose to start all services except the client: .. code-block:: bash - $ cd docker/staging + $ cd dockerfiles/staging $ CURRENT_UID=$(id -u):$(id -g) docker-compose up -d coordinator exporter dut To run the smoke test just run the client: diff --git a/docker/base/Dockerfile b/dockerfiles/base/Dockerfile similarity index 100% rename from docker/base/Dockerfile rename to dockerfiles/base/Dockerfile diff --git a/docker/build.sh b/dockerfiles/build.sh similarity index 51% rename from docker/build.sh rename to dockerfiles/build.sh index 53d94c1e7..3feae78e3 100755 --- a/docker/build.sh +++ b/dockerfiles/build.sh @@ -3,5 +3,5 @@ set -ex for dir in base client exporter coordinator; do - docker build -t labgrid-${dir} -f docker/${dir}/Dockerfile . + docker build -t labgrid-${dir} -f dockerfiles/${dir}/Dockerfile . done diff --git a/docker/client/Dockerfile b/dockerfiles/client/Dockerfile similarity index 100% rename from docker/client/Dockerfile rename to dockerfiles/client/Dockerfile diff --git a/docker/coordinator/Dockerfile b/dockerfiles/coordinator/Dockerfile similarity index 100% rename from docker/coordinator/Dockerfile rename to dockerfiles/coordinator/Dockerfile diff --git a/docker/exporter/Dockerfile b/dockerfiles/exporter/Dockerfile similarity index 85% rename from docker/exporter/Dockerfile rename to dockerfiles/exporter/Dockerfile index 5e7554bfc..dbaf7c080 100644 --- a/docker/exporter/Dockerfile +++ b/dockerfiles/exporter/Dockerfile @@ -1,6 +1,6 @@ FROM labgrid-base -COPY docker/exporter/entrypoint.sh /entrypoint.sh +COPY dockerfiles/exporter/entrypoint.sh /entrypoint.sh RUN set -e ;\ cd /opt/labgrid ;\ diff --git a/docker/exporter/entrypoint.sh b/dockerfiles/exporter/entrypoint.sh similarity index 100% rename from docker/exporter/entrypoint.sh rename to dockerfiles/exporter/entrypoint.sh diff --git a/docker/staging/client/.ssh/id_rsa b/dockerfiles/staging/client/.ssh/id_rsa similarity index 100% rename from docker/staging/client/.ssh/id_rsa rename to dockerfiles/staging/client/.ssh/id_rsa diff --git a/docker/staging/client/simple-test/remote.yaml b/dockerfiles/staging/client/simple-test/remote.yaml similarity index 100% rename from docker/staging/client/simple-test/remote.yaml rename to dockerfiles/staging/client/simple-test/remote.yaml diff --git a/docker/staging/client/simple-test/remote_shell_test.py b/dockerfiles/staging/client/simple-test/remote_shell_test.py similarity index 100% rename from docker/staging/client/simple-test/remote_shell_test.py rename to dockerfiles/staging/client/simple-test/remote_shell_test.py diff --git a/docker/staging/crossbar/places_example.yaml b/dockerfiles/staging/crossbar/places_example.yaml similarity index 100% rename from docker/staging/crossbar/places_example.yaml rename to dockerfiles/staging/crossbar/places_example.yaml diff --git a/docker/staging/docker-compose.yml b/dockerfiles/staging/docker-compose.yml similarity index 100% rename from docker/staging/docker-compose.yml rename to dockerfiles/staging/docker-compose.yml diff --git a/docker/staging/dut/Dockerfile b/dockerfiles/staging/dut/Dockerfile similarity index 100% rename from docker/staging/dut/Dockerfile rename to dockerfiles/staging/dut/Dockerfile diff --git a/docker/staging/dut/authorized_keys b/dockerfiles/staging/dut/authorized_keys similarity index 100% rename from docker/staging/dut/authorized_keys rename to dockerfiles/staging/dut/authorized_keys diff --git a/docker/staging/exporter-conf/exporter.yaml b/dockerfiles/staging/exporter-conf/exporter.yaml similarity index 100% rename from docker/staging/exporter-conf/exporter.yaml rename to dockerfiles/staging/exporter-conf/exporter.yaml