Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not include log option details in Docker logs #2

Merged
merged 2 commits into from
Jan 14, 2025
Merged

fix: do not include log option details in Docker logs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c39ed
fix: do not include log option details in Docker logs
stempler Jan 13, 2025
48da759
ci: use `docker compose` instead of `docker-compose`
stempler Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/orchestrators/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func (o *DockerOrchestrator) DeployAgent(image string, cmd []string, envs []stri
body, err := o.client.ContainerLogs(context.Background(), container.ID, types.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
Details: true,
Details: false,
Follow: true,
})
if err != nil {
Expand Down Expand Up @@ -363,7 +363,7 @@ func (o *DockerOrchestrator) AttachOrphanAgent(containerID, namespace string) (s
body, err := o.client.ContainerLogs(context.Background(), container.ID, types.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
Details: true,
Details: false,
Follow: true,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/orchestrators/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func TestDockerDeployAgentSuccess(t *testing.T) {
mockDocker.EXPECT().ContainerLogs(context.Background(), "alpha", types.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
Details: true,
Details: false,
Follow: true,
}).Return(ioutil.NopCloser(bytes.NewReader([]byte("foo"))), nil).Times(1)

Expand Down
20 changes: 10 additions & 10 deletions test/integration/docker/tests/mysql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')

echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env

docker-compose up -d mysql minio
docker compose up -d mysql minio

sleep 30

docker-compose exec -T mysql mysql -prootpassword bivac < mysql_seed.sql
docker compose exec -T mysql mysql -prootpassword bivac < mysql_seed.sql

docker-compose up -d bivac
docker compose up -d bivac

docker-compose exec -T bivac bivac backup docker_mysql_data
docker compose exec -T bivac bivac backup docker_mysql_data

docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_mysql_data/ dump latest /var/lib/docker/volumes/docker_mysql_data/_data/backups/all.sql > /data/mysql_dump.sql"
docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_mysql_data/ dump latest /var/lib/docker/volumes/docker_mysql_data/_data/backups/all.sql > /data/mysql_dump.sql"

docker-compose down -v
docker compose down -v

docker-compose up -d mysql
docker compose up -d mysql

sleep 30

docker-compose exec -T mysql mysql -prootpassword bivac < mysql_dump.sql
docker compose exec -T mysql mysql -prootpassword bivac < mysql_dump.sql

docker-compose exec -T mysql mysql -prootpassword bivac -e "select * from authors"
docker compose exec -T mysql mysql -prootpassword bivac -e "select * from authors"

rm -f mysql_dump.sql
rm -f .env

docker-compose down -v
docker compose down -v
22 changes: 11 additions & 11 deletions test/integration/docker/tests/postgres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')

echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env

docker-compose up -d postgres minio
docker compose up -d postgres minio

sleep 30

docker-compose exec -T postgres psql -U postgres bivac < postgres_seed.sql
docker compose exec -T postgres psql -U postgres bivac < postgres_seed.sql

docker-compose up -d bivac
docker compose up -d bivac

docker-compose exec -T bivac bivac backup docker_postgres_data
docker compose exec -T bivac bivac backup docker_postgres_data

docker-compose run restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > postgres_dump.sql
docker compose run restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > postgres_dump.sql

docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > /data/postgres_dump.sql"
docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > /data/postgres_dump.sql"

docker-compose down -v
docker compose down -v

docker-compose up -d postgres
docker compose up -d postgres

sleep 30

docker-compose exec -T postgres psql -U postgres bivac < postgres_dump.sql
docker compose exec -T postgres psql -U postgres bivac < postgres_dump.sql

docker-compose exec -T postgres psql -U postgres bivac -c "select * from users"
docker compose exec -T postgres psql -U postgres bivac -c "select * from users"

rm -f postgres_dump.sql
rm -f .env

docker-compose down -v
docker compose down -v
16 changes: 8 additions & 8 deletions test/integration/docker/tests/raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')

echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env

docker-compose up -d raw minio
docker compose up -d raw minio

docker-compose exec -T raw bash -c "echo 'foo' > /data/foo"
docker-compose exec -T raw bash -c "mkdir -p /data/subdir && echo 'bar' > /data/subdir/bar"
docker compose exec -T raw bash -c "echo 'foo' > /data/foo"
docker compose exec -T raw bash -c "mkdir -p /data/subdir && echo 'bar' > /data/subdir/bar"

docker-compose up -d bivac
docker compose up -d bivac

docker-compose exec -T bivac bivac backup docker_raw_data
docker compose exec -T bivac bivac backup docker_raw_data

TEST_1=$(docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/foo")
TEST_2=$(docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/subdir/bar")
TEST_1=$(docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/foo")
TEST_2=$(docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/subdir/bar")

if [ "${TEST_1}" != "foo" ]; then
echo "${TEST_1} != \"foo\"."
Expand All @@ -29,6 +29,6 @@ if [ "${TEST_2}" != "bar" ]; then
exit 1
fi

docker-compose down -v
docker compose down -v

rm -f .env
Loading