diff --git a/ci/release/debian.go b/ci/release/debian.go index 0a3167b344..21a36557c0 100644 --- a/ci/release/debian.go +++ b/ci/release/debian.go @@ -38,7 +38,7 @@ func releaseDebianPPA(opts *releaseDebianOpts) error { return err } - for _, codename := range []string{"bionic", "focal", "jammy"} { + for _, codename := range []string{"bionic", "focal", "jammy", "noble"} { err := shell.NewCmdf("bin/release_ppa %s %s %s %s", opts.repository, opts.version, opts.buildNumber, codename).Run() if err != nil { return err diff --git a/ci/test/testinstall/Dockerfile.ubuntu-noble b/ci/test/testinstall/Dockerfile.ubuntu-noble new file mode 100644 index 0000000000..87af4ee4c4 --- /dev/null +++ b/ci/test/testinstall/Dockerfile.ubuntu-noble @@ -0,0 +1,34 @@ +FROM ubuntu:24.04 + +ENV container docker +ENV LC_ALL C +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update \ + && apt install -y systemd \ + && apt-get clean + +RUN cd /lib/systemd/system/sysinit.target.wants/ \ + && ls | grep -v systemd-tmpfiles-setup | xargs rm -f $1 + +RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ + /etc/systemd/system/*.wants/* \ + /lib/systemd/system/local-fs.target.wants/* \ + /lib/systemd/system/sockets.target.wants/*udev* \ + /lib/systemd/system/sockets.target.wants/*initctl* \ + /lib/systemd/system/basic.target.wants/* \ + /lib/systemd/system/anaconda.target.wants/* \ + /lib/systemd/system/plymouth* \ + /lib/systemd/system/systemd-update-utmp* + +# https://github.com/moby/moby/issues/1297 +RUN echo resolvconf resolvconf/linkify-resolvconf boolean false | debconf-set-selections + +RUN apt update \ + && apt install -y \ + sudo \ + curl + +VOLUME ["/sys/fs/cgroup"] + +CMD ["/lib/systemd/systemd"] diff --git a/ci/test/testinstall/install_integration_test.go b/ci/test/testinstall/install_integration_test.go index 9b58fbd272..cbb30bbf21 100644 --- a/ci/test/testinstall/install_integration_test.go +++ b/ci/test/testinstall/install_integration_test.go @@ -49,6 +49,7 @@ func TestInstall(t *testing.T) { "ubuntu-focal", "ubuntu-impish", "ubuntu-jammy", + "ubuntu-noble", } for _, img := range images { t.Run(img, func(t *testing.T) { diff --git a/e2e/runner.go b/e2e/runner.go index 96df59e444..8213183a7d 100644 --- a/e2e/runner.go +++ b/e2e/runner.go @@ -42,8 +42,8 @@ func NewRunner(composeFiles []string, testEnv, services string) (runner *Runner, args = append(args, "-p", testEnv) runner = &Runner{ - compose: sh.RunCmd("docker-compose", args...), - composeOut: sh.OutCmd("docker-compose", args...), + compose: sh.RunCmd("docker", append([]string{"compose"}, args...)...), + composeOut: sh.OutCmd("docker", append([]string{"compose"}, args...)...), testEnv: testEnv, services: services, } diff --git a/localnet/localnet.go b/localnet/localnet.go index 9796109ba0..128ad9e9c8 100644 --- a/localnet/localnet.go +++ b/localnet/localnet.go @@ -21,9 +21,10 @@ import ( "time" "github.com/magefile/mage/sh" - "github.com/mysteriumnetwork/node/logconfig" "github.com/pkg/errors" "github.com/rs/zerolog/log" + + "github.com/mysteriumnetwork/node/logconfig" ) const composeFile = "./docker-compose.localnet.yml" @@ -61,7 +62,7 @@ func newRunner(composeFiles ...string) *runner { args = append(args, "-p", envName) return &runner{ - compose: sh.RunCmd("docker-compose", args...), + compose: sh.RunCmd("docker", append([]string{"compose"}, args...)...), envName: envName, } }