diff --git a/container/Containerfile b/container/Containerfile index abb6880..fb12606 100644 --- a/container/Containerfile +++ b/container/Containerfile @@ -25,7 +25,7 @@ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ python3-pip \ dotnet-sdk-10.0 \ openssl-devel \ - zeromq-devel + bubblewrap # codex # === setup user === RUN useradd -ms /bin/bash user && \ @@ -81,7 +81,7 @@ RUN dotnet tool install --tool-path /usr/local/bin dotnet-ef && \ | tar xz -C /usr/local/bin/omnisharp && \ chmod +x /usr/local/bin/omnisharp/OmniSharp -# PHP + ZeroMQ +# PHP + NATS CLI RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ dnf -y install https://rpm.henderkes.com/static-php-1-0.noarch.rpm && \ dnf -y module enable php-zts:static-8.5 && \ @@ -105,25 +105,13 @@ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ php-zts-bcmath \ php-zts-mysqli \ php-zts-imagick \ - php-zts-grpc \ - php-zts-devel \ - autoconf \ - automake \ - libtool \ - make && \ - git clone --depth 1 https://github.com/chrisBirmingham/phpzmq.git /tmp/phpzmq && \ - cd /tmp/phpzmq && \ - phpize-zts && \ - ./configure --with-php-config=/usr/bin/php-config-zts --with-zmq && \ - make -j"$(nproc)" && \ - make install && \ - PHP_INI_SCAN_DIR="$(php-config-zts --ini-dir)" && \ - mkdir -p "${PHP_INI_SCAN_DIR}" && \ - echo 'extension=zmq.so' > "${PHP_INI_SCAN_DIR}/40-zmq.ini" && \ - cd / && rm -rf /tmp/phpzmq && \ - dnf remove -y php-zts-devel autoconf automake libtool && \ - curl -fsSL https://getcomposer.org/installer \ + php-zts-sodium \ + php-zts-ffi \ + && curl -fsSL https://getcomposer.org/installer \ | php -- --install-dir=/usr/local/bin --filename=composer + +# === PHP settings +# RUN echo "ffi.enable=true" >> /etc/php-zts/conf.d/15-ffi.ini # === install language servers, tools === RUN pnpm add -g \ @@ -140,6 +128,9 @@ RUN mkdir -p /usr/local/bin/python-bins/code-review-graph && \ ln -sf \ /usr/local/bin/python-bins/code-review-graph/bin/code-review-graph \ /usr/local/bin/code-review-graph + +RUN curl -sf https://binaries.nats.dev/nats-io/natscli/nats@latest | sh \ + && mv nats /usr/local/bin/ USER user WORKDIR /home/user