From 36dabd454bf137f74ab7c3e372b060a4ded7f284 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 14 Oct 2026 15:59:48 +0500 Subject: t/i/docker: move SSH setup to git_server --- test/integration/docker/git_server/Dockerfile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'test/integration/docker/git_server/Dockerfile') diff --git a/test/integration/docker/git_server/Dockerfile b/test/integration/docker/git_server/Dockerfile index 97306f9..2d0fbe4 100644 --- a/test/integration/docker/git_server/Dockerfile +++ b/test/integration/docker/git_server/Dockerfile @@ -1,24 +1,16 @@ FROM alpine:3.24 -RUN apk add -q --no-cache bash git openssh-server tini && \ +RUN apk add -q --no-cache bash git openssh-client-common openssh-server tini && \ echo 'root:root' | chpasswd && \ - git config --global user.name 'John Doe' && \ - git config --global user.email 'John.Doe@example.com' && \ - git config --global init.defaultBranch main && \ sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config +USER root WORKDIR /root -COPY ["ssh_keys/server_key", "/etc/ssh/ssh_host_ed25519_key"] -COPY ["ssh_keys/server_key.pub", "/etc/ssh/ssh_host_ed25519_key.pub"] -COPY ["ssh_keys/client_key.pub", "./.ssh/authorized_keys"] +COPY ["git_server/setup.sh", "./"] +RUN ./setup.sh -RUN chmod 0600 -- /etc/ssh/ssh_host_ed25519_key && \ - chmod 0700 -- ./.ssh/ && \ - chmod 0600 -- ./.ssh/authorized_keys +COPY ["git_server/entrypoint.sh", "/"] +ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"] -COPY ["git_server/setup_repo.sh", "./"] -RUN ./setup_repo.sh - -ENTRYPOINT ["/sbin/tini", "--"] CMD ["/usr/sbin/sshd", "-D"] -- cgit v1.3