Page MenuHomeDevCentral
Files F3767307

D2518.diff
No OneTemporary
Actions

D2518.diff
View Options

diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@
#
ENV PHP_VERSION 7.4.3
-ENV ONIGURAMA_VERSION 6.9.4
+ENV ONIGURAMA_VERSION=6.9.7.1
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
@@ -49,9 +49,9 @@
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
&& wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
- && cd /usr/src \
- && tar xzf onigurama.tar.gz \
- && cd onig-$ONIGURAMA_VERSION \
+ && mkdir /usr/src/onigurama \
+ && cd /usr/src/onigurama \
+ && tar xzf ../onigurama.tar.gz --strip-components=1 \
&& ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
diff --git a/novolume/Dockerfile b/novolume/Dockerfile
--- a/novolume/Dockerfile
+++ b/novolume/Dockerfile
@@ -10,7 +10,7 @@
#
ENV PHP_VERSION 7.4.3
-ENV ONIGURAMA_VERSION 6.9.4
+ENV ONIGURAMA_VERSION 6.9.7.1
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
@@ -49,9 +49,9 @@
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
&& wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
- && cd /usr/src \
- && tar xzf onigurama.tar.gz \
- && cd onig-$ONIGURAMA_VERSION \
+ && mkdir /usr/src/onigurama \
+ && cd /usr/src/onigurama \
+ && tar xzf ../onigurama.tar.gz --strip-components=1 \
&& ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 23:27 (19 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259167
Default Alt Text
D2518.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator