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 c06b122..e6ee226 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,12 +1,12 @@ -FROM centos:7 +FROM rockylinux:8 + +RUN echo "assumeyes=1" >> /etc/yum.conf RUN yum search epel-release RUN yum info epel-release RUN yum install -y epel-release wget RUN yum update -y -RUN yum install -y git autoconf automake make cmake3 json-c-devel centos-release-scl-rh libnghttp2 libpsl libtool pkgconfig fuse-devel file cargo libcurl-devel -RUN yum install -y devtoolset-11-gcc-c++ -RUN ln -s /usr/bin/cmake3 /usr/bin/cmake +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