Merge pull request #334 from basecamp/fix-ssh-symlink

Fix ssh symlink
This commit is contained in:
Donal McBreen
2023-06-15 12:14:30 +01:00
committed by GitHub
2 changed files with 8 additions and 0 deletions

View File

@@ -17,6 +17,7 @@ RUN apt-get update --fix-missing && apt-get install -y docker-ce docker-ce-cli c
COPY *.sh . COPY *.sh .
COPY app/ . COPY app/ .
RUN rm -rf /root/.ssh
RUN ln -s /shared/ssh /root/.ssh RUN ln -s /shared/ssh /root/.ssh
RUN mkdir -p /etc/docker/certs.d/registry:4443 && ln -s /shared/certs/domain.crt /etc/docker/certs.d/registry:4443/ca.crt RUN mkdir -p /etc/docker/certs.d/registry:4443 && ln -s /shared/certs/domain.crt /etc/docker/certs.d/registry:4443/ca.crt

View File

@@ -10,6 +10,13 @@ class IntegrationTest < ActiveSupport::TestCase
end end
teardown do teardown do
unless passed?
[:deployer, :vm1, :vm2, :shared, :load_balancer].each do |container|
puts
puts "Logs for #{container}:"
docker_compose :logs, container
end
end
docker_compose "down -t 1" docker_compose "down -t 1"
end end