diff --git a/scripts/docker/ubuntu-24.04-base.dockerfile b/scripts/docker/ubuntu-24.04-base.dockerfile index 6ba8364ab87e..9eadc95e8294 100644 --- a/scripts/docker/ubuntu-24.04-base.dockerfile +++ b/scripts/docker/ubuntu-24.04-base.dockerfile @@ -1,5 +1,14 @@ FROM ubuntu:24.04 +# Build as: +# +# docker build -f scripts/docker/ubuntu-24.04-base.dockerfile +# +# The Dockerfile setups: +# * all userver build dependencies +# * all userver test dependencies (e.g. for testsuite) +# It does not contain userver itself. + COPY scripts/docs/en/deps/ubuntu-24.04.md /userver_tmp/ COPY scripts/postgres/ubuntu-install-postgresql-includes.sh /userver_tmp/ diff --git a/scripts/postgres/ubuntu-install-postgresql-includes.sh b/scripts/postgres/ubuntu-install-postgresql-includes.sh index a2ec6027acb0..5a912e198dc9 100755 --- a/scripts/postgres/ubuntu-install-postgresql-includes.sh +++ b/scripts/postgres/ubuntu-install-postgresql-includes.sh @@ -5,7 +5,7 @@ set -euox pipefail POSTGRESQL_VERSION=${POSTGRESQL_VERSION:=16} -apt remove postgresql-server-dev-${POSTGRESQL_VERSION} +apt remove -y postgresql-server-dev-${POSTGRESQL_VERSION} # Installing postgresql-server-dev-14 without dependencies # diff --git a/universal/utest/src/utest/log_capture_fixture.cpp b/universal/utest/src/utest/log_capture_fixture.cpp index fec9cf256554..76605a9a645d 100644 --- a/universal/utest/src/utest/log_capture_fixture.cpp +++ b/universal/utest/src/utest/log_capture_fixture.cpp @@ -144,7 +144,7 @@ LogRecord GetSingleLog(utils::span log, const utils::impl::Sour } throw NotSingleLogError(msg); } - auto single_record = std::move(log[0]); + auto single_record = log[0]; return single_record; }