From 4beb075783e8f1b4081e429eec78dd96c3be57ae Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 29 Mar 2022 23:18:04 +0300 Subject: rename Compose services, move directories around, etc. --- test/integration/docker/.dockerignore | 4 ++-- test/integration/docker/cgitize/.gitignore | 1 + test/integration/docker/cgitize/etc/cgitize.toml | 4 ++++ test/integration/docker/client/.gitignore | 1 - test/integration/docker/client/etc/cgitize.toml | 4 ---- test/integration/docker/docker-compose.yml | 11 ++++----- test/integration/docker/git_server/Dockerfile | 23 +++++++++++++++++++ test/integration/docker/git_server/setup_repo.sh | 29 ++++++++++++++++++++++++ test/integration/docker/server/Dockerfile | 23 ------------------- test/integration/docker/server/setup_repo.sh | 29 ------------------------ test/integration/docker/test.sh | 8 +++---- 11 files changed, 68 insertions(+), 69 deletions(-) create mode 100644 test/integration/docker/cgitize/.gitignore create mode 100644 test/integration/docker/cgitize/etc/cgitize.toml delete mode 100644 test/integration/docker/client/.gitignore delete mode 100644 test/integration/docker/client/etc/cgitize.toml create mode 100644 test/integration/docker/git_server/Dockerfile create mode 100755 test/integration/docker/git_server/setup_repo.sh delete mode 100644 test/integration/docker/server/Dockerfile delete mode 100755 test/integration/docker/server/setup_repo.sh (limited to 'test/integration') diff --git a/test/integration/docker/.dockerignore b/test/integration/docker/.dockerignore index c0cb0ce..a4e3191 100644 --- a/test/integration/docker/.dockerignore +++ b/test/integration/docker/.dockerignore @@ -1,5 +1,5 @@ * -!/server/** -/server/Dockerfile +!/git_server/** +/git_server/Dockerfile !/ssh/** diff --git a/test/integration/docker/cgitize/.gitignore b/test/integration/docker/cgitize/.gitignore new file mode 100644 index 0000000..ea1472e --- /dev/null +++ b/test/integration/docker/cgitize/.gitignore @@ -0,0 +1 @@ +output/ diff --git a/test/integration/docker/cgitize/etc/cgitize.toml b/test/integration/docker/cgitize/etc/cgitize.toml new file mode 100644 index 0000000..f20ba77 --- /dev/null +++ b/test/integration/docker/cgitize/etc/cgitize.toml @@ -0,0 +1,4 @@ +[repositories.test_repo] + +name = "test_repo" +clone_url = "root@git_server:~/test_repo" diff --git a/test/integration/docker/client/.gitignore b/test/integration/docker/client/.gitignore deleted file mode 100644 index ea1472e..0000000 --- a/test/integration/docker/client/.gitignore +++ /dev/null @@ -1 +0,0 @@ -output/ diff --git a/test/integration/docker/client/etc/cgitize.toml b/test/integration/docker/client/etc/cgitize.toml deleted file mode 100644 index f20ba77..0000000 --- a/test/integration/docker/client/etc/cgitize.toml +++ /dev/null @@ -1,4 +0,0 @@ -[repositories.test_repo] - -name = "test_repo" -clone_url = "root@git_server:~/test_repo" diff --git a/test/integration/docker/docker-compose.yml b/test/integration/docker/docker-compose.yml index b5560e2..1a5acf6 100644 --- a/test/integration/docker/docker-compose.yml +++ b/test/integration/docker/docker-compose.yml @@ -3,15 +3,14 @@ services: git_server: build: context: . - dockerfile: server/Dockerfile - image: git_server - backend: + dockerfile: git_server/Dockerfile + cgitize: extends: file: ../../../docker-compose.yml - service: backend + service: cgitize environment: SCHEDULE: once volumes: - - ./client/etc/:/etc/cgitize:ro + - ./cgitize/etc:/etc/cgitize:ro - "$SSH_AUTH_SOCK:/ssh-agent.sock" - - ./client/output:/mnt/cgitize + - ./cgitize/output:/mnt/cgitize diff --git a/test/integration/docker/git_server/Dockerfile b/test/integration/docker/git_server/Dockerfile new file mode 100644 index 0000000..a5756d3 --- /dev/null +++ b/test/integration/docker/git_server/Dockerfile @@ -0,0 +1,23 @@ +FROM alpine:3.15 + +RUN apk --no-cache add bash git openssh-server tini && \ + echo 'root:root' | chpasswd && \ + git config --global user.name 'John Doe' && \ + git config --global user.email 'John.Doe@example.com' && \ + sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config + +WORKDIR /root + +COPY ["ssh/server_key", "/etc/ssh/ssh_host_ed25519_key"] +COPY ["ssh/server_key.pub", "/etc/ssh/ssh_host_ed25519_key.pub"] +COPY ["ssh/client_key.pub", "./.ssh/authorized_keys"] + +RUN chmod 0600 -- /etc/ssh/ssh_host_ed25519_key && \ + chmod 0700 -- ./.ssh/ && \ + chmod 0600 -- ./.ssh/authorized_keys + +COPY ["git_server/setup_repo.sh", "./"] +RUN ./setup_repo.sh + +ENTRYPOINT ["/sbin/tini", "--"] +CMD ["/usr/sbin/sshd", "-D"] diff --git a/test/integration/docker/git_server/setup_repo.sh b/test/integration/docker/git_server/setup_repo.sh new file mode 100755 index 0000000..82ae711 --- /dev/null +++ b/test/integration/docker/git_server/setup_repo.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +readonly local_repo_path="$HOME/test_repo" + +setup_local_repo() { + echo + echo ---------------------------------------------------------------------- + echo Setting up upstream repository + echo ---------------------------------------------------------------------- + + mkdir -p -- "$local_repo_path" + pushd -- "$local_repo_path" > /dev/null + git init + echo '1' > 1.txt + git add . + git commit -m 'first commit' + echo '2' > 2.txt + git add . + git commit -m 'second commit' + popd > /dev/null +} + +main() { + setup_local_repo +} + +main diff --git a/test/integration/docker/server/Dockerfile b/test/integration/docker/server/Dockerfile deleted file mode 100644 index 3ebe89b..0000000 --- a/test/integration/docker/server/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM alpine:3.15 - -RUN apk --no-cache add bash git openssh-server tini && \ - echo 'root:root' | chpasswd && \ - git config --global user.name 'John Doe' && \ - git config --global user.email 'John.Doe@example.com' && \ - sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config - -WORKDIR /root - -COPY ["ssh/server_key", "/etc/ssh/ssh_host_ed25519_key"] -COPY ["ssh/server_key.pub", "/etc/ssh/ssh_host_ed25519_key.pub"] -COPY ["ssh/client_key.pub", "./.ssh/authorized_keys"] - -RUN chmod 0600 -- /etc/ssh/ssh_host_ed25519_key && \ - chmod 0700 -- ./.ssh/ && \ - chmod 0600 -- ./.ssh/authorized_keys - -COPY ["server/setup_repo.sh", "./"] -RUN ./setup_repo.sh - -ENTRYPOINT ["/sbin/tini", "--"] -CMD ["/usr/sbin/sshd", "-D"] diff --git a/test/integration/docker/server/setup_repo.sh b/test/integration/docker/server/setup_repo.sh deleted file mode 100755 index 82ae711..0000000 --- a/test/integration/docker/server/setup_repo.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -o nounset -o pipefail - -readonly local_repo_path="$HOME/test_repo" - -setup_local_repo() { - echo - echo ---------------------------------------------------------------------- - echo Setting up upstream repository - echo ---------------------------------------------------------------------- - - mkdir -p -- "$local_repo_path" - pushd -- "$local_repo_path" > /dev/null - git init - echo '1' > 1.txt - git add . - git commit -m 'first commit' - echo '2' > 2.txt - git add . - git commit -m 'second commit' - popd > /dev/null -} - -main() { - setup_local_repo -} - -main diff --git a/test/integration/docker/test.sh b/test/integration/docker/test.sh index e55841f..239385e 100755 --- a/test/integration/docker/test.sh +++ b/test/integration/docker/test.sh @@ -10,7 +10,7 @@ readonly script_name readonly ssh_dir="$script_dir/ssh" readonly client_key_password='password' -readonly output_dir="$script_dir/client/output" +readonly output_dir="$script_dir/cgitize/output" dump() { local prefix="${FUNCNAME[0]}" @@ -140,7 +140,7 @@ run_git_server() { run_cgitize() { echo echo ---------------------------------------------------------------------- - echo Running the client + echo Running cgitize echo ---------------------------------------------------------------------- if [ -z "${SSH_AUTH_SOCK:+x}" ]; then @@ -148,7 +148,7 @@ run_cgitize() { return 1 fi dump "SSH_AUTH_SOCK: $SSH_AUTH_SOCK" - docker-compose run --rm backend + docker-compose run --rm cgitize } run() { @@ -162,7 +162,7 @@ verify() { echo Checking the pulled repository echo ---------------------------------------------------------------------- - pushd -- "$script_dir/client/output/test_repo" > /dev/null + pushd -- "$script_dir/cgitize/output/test_repo" > /dev/null git log --oneline popd > /dev/null } -- cgit v1.2.3