From a1c39d6f557661e76fcd350afb99f27284a8988b Mon Sep 17 00:00:00 2001 From: Matthias Gatto Date: Mon, 29 Jul 2024 15:03:35 +0200 Subject: [PATCH] no devtools Signed-off-by: Matthias Gatto --- .github/workflows/linux-pkg-build.yaml | 2 +- docker/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-pkg-build.yaml b/.github/workflows/linux-pkg-build.yaml index 6c7a76a..faca5ea 100644 --- a/.github/workflows/linux-pkg-build.yaml +++ b/.github/workflows/linux-pkg-build.yaml @@ -19,7 +19,7 @@ jobs: sudo apt-get update --fix-missing sudo apt-get install -y -f -o Acquire::Retries=3 cargo libfuse2 docker build -t oapi-build ./docker - docker run --device /dev/fuse --cap-add SYS_ADMIN --privileged=True -v $PWD:/oapi-cli oapi-build scl enable devtoolset-11 -- /oapi-cli/docker/make.sh cp + docker run --device /dev/fuse --cap-add SYS_ADMIN --privileged=True -v $PWD:/oapi-cli oapi-build /oapi-cli/docker/make.sh cp sudo chown $(whoami) -R ./docker-package/ ./docker-package/oapi-cli-x86_64.AppImage --appimage-extract-and-run --help ./docker-package/oapi-cli-x86_64.AppImage --help diff --git a/docker/Dockerfile b/docker/Dockerfile index d0a8080..e6ee226 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,8 +7,6 @@ RUN yum info epel-release RUN yum install -y epel-release wget RUN yum update -y -RUN yum search devtoolset-11 -RUN yum install -y git autoconf automake make cmake json-c-devel scl-utils libnghttp2 libpsl libtool pkgconfig fuse-devel file cargo libcurl-devel -RUN yum install -y devtoolset-11-gcc-c++ +RUN yum install -y git autoconf automake make cmake json-c-devel libnghttp2 libpsl libtool pkgconfig fuse-devel file cargo libcurl-devel RUN yum clean all \ No newline at end of file