diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 3c6d7ec..6052db7 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -30,13 +30,8 @@ jobs: ccache-dir-${{github.ref}}_run- ccache- - - name: Install docker-compose - run: | - sudo apt update - sudo apt install --allow-downgrades -y docker-compose - - name: Setup ccache - run: docker-compose run --rm realmedium-sample bash -c 'ccache -M 4.0GB && ccache -s' + run: docker compose run --rm realmedium-sample bash -c 'ccache -M 4.0GB && ccache -s' - name: Cmake run: make docker-cmake-release diff --git a/Makefile b/Makefile index eec3ea8..11b915e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ CMAKE_RELEASE_FLAGS ?= CMAKE_OS_FLAGS ?= -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 -DUSERVER_FEATURE_REDIS_HI_MALLOC=1 NPROCS ?= $(shell nproc) CLANG_FORMAT ?= clang-format -DOCKER_COMPOSE ?= docker-compose +DOCKER_COMPOSE ?= docker compose ifeq ($(KERNEL),Darwin) CMAKE_COMMON_FLAGS += -DUSERVER_NO_WERROR=1 -DUSERVER_CHECK_PACKAGE_VERSIONS=0 \