diff --git a/Dockerfile b/Dockerfile index 946dd23..a7ccf37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,41 +47,44 @@ RUN sed -i 's!static unsigned char sigsegv_stack\[SIGSTKSZ\]!static max_align_t RUN make install RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ - libreadline8 bash-completion sudo tzdata libtool-bin + libreadline8 bash-completion sudo tzdata libtool-bin software-properties-common + +RUN add-apt-repository ppa:ondrej/php RUN apt-get update && apt-get -y install \ - php8.1-memcached \ + php8.2-memcached \ php-redis \ - php8.1-bcmath \ - php8.1-bz2 \ - php8.1-cli \ - php8.1-common \ - php8.1-curl \ - php8.1-gmp \ - php8.1-intl \ + php8.2-bcmath \ + php8.2-bz2 \ + php8.2-cli \ + php8.2-common \ + php8.2-curl \ + php8.2-gmp \ + php8.2-intl \ php-json \ - php8.1-mbstring \ - php8.1-mysql \ - php8.1-odbc \ - php8.1-opcache \ - php8.1-pgsql \ - php8.1-readline \ - php8.1-tidy \ - php8.1-xml \ - php8.1-xsl \ - php8.1-zip \ - php8.1-gd \ + php8.2-mbstring \ + php8.2-mysql \ + php8.2-odbc \ + php8.2-opcache \ + php8.2-pgsql \ + php8.2-readline \ + php8.2-tidy \ + php8.2-xml \ + php8.2-xsl \ + php8.2-zip \ + php8.2-gd \ php-bcmath \ php-apcu \ php-cli \ php-imagick \ php-intl \ - php-xdebug + php-xdebug \ + php-amqp WORKDIR /tmp RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ + && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ && php composer-setup.php \ && php -r "unlink('composer-setup.php');" RUN mv composer.phar /usr/bin/composer @@ -138,7 +141,6 @@ RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \ # Protobuf RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install protobuf-compiler -RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra ispell idutch irussian ienglish-common offlineimap3 maildir-utils RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-client iputils-ping unzip @@ -158,6 +160,10 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install cargo # Matrix stuff RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libolm-dev libclang-dev +# Writing stuff +RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc pandoc-citeproc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-bibtex-extra ispell idutch irussian ienglish-common offlineimap3 maildir-utils + + ADD . /opt/workspace-repo WORKDIR /opt/workspace-repo RUN /usr/local/go/bin/go build .