UNCLASSIFIED

Commit f983ebc7 authored by Jeffrey Weatherford's avatar Jeffrey Weatherford
Browse files

Merge branch 'update-7-4-10' into 'development'

Update 7 4 11

See merge request !11
parents f3016724 2c72f88b
Pipeline #91972 passed with stages
in 30 minutes and 13 seconds
......@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="php" \
org.opencontainers.image.description="PHP is a popular general-purpose scripting language that is especially suited to web development." \
org.opencontainers.image.licenses="PHP-3.01" \
org.opencontainers.image.url="https://www.php.net/" \
org.opencontainers.image.version="7.4.9" \
org.opencontainers.image.version="7.4.11" \
maintainer="cht@dsop.io"
COPY php.tar.gz /usr/local/src/
......@@ -21,9 +21,9 @@ COPY libsodium.tar.gz /
RUN dnf update --setopt=tsflags=nodocs -y \
&& dnf install --setopt=tsflags=nodocs -y \
gcc \
gcc \
gcc-c++ \
make \
make \
libxml2-devel \
autoconf \
automake \
......@@ -129,6 +129,23 @@ COPY --from=builder --chown=1001:1001 /usr/local/include/php /usr/local/include/
COPY config/php.ini ${PHP_INI_PATH}/php.ini
COPY scripts/docker-php-entrypoint /usr/local/bin/entrypoint
# We really should make sure we are not leaving a mess of things not
# required for runtime
RUN dnf remove -y \
gcc \
gcc-c++ \
make \
libxml2-devel \
autoconf \
automake \
help2man \
libtool \
sqlite \
sqlite-devel \
openssl-devel \
curl-devel \
&& dnf clean all
USER 1001
WORKDIR "/var/www/html"
......
@Library('DCCSCR@master') _
dccscrPipeline(version: "7.4.9")
dccscrPipeline(version: "7.4.11")
resources:
- url: "https://github.com/php/php-src/archive/php-7.4.9.tar.gz"
- url: "https://www.php.net/distributions/php-7.4.11.tar.gz"
filename: "php.tar.gz"
validation:
type: "sha256"
value: "57fb5408893a95bdd2a0cc75b6862e1903281cebb4e0824cec2d512760159e11"
- url: "https://github.com/skvadrik/re2c/archive/2.0.tar.gz"
value: "b4fae5c39ca1eedf5597071996d9c85d0674b83f5003126c39b7b44bbfbcd821"
- url: "https://github.com/skvadrik/re2c/archive/2.0.3.tar.gz"
filename: "re2c.tar.gz"
validation:
type: "sha256"
value: "c2b5f7d2c8a112689201f9b994538ec32cf13ae7cd2e4f3287f72117f1bfa4e6"
value: "f131b3d5b618454caa5f2ddcc8288b797c78781056a40c2899c832493827c003"
- url: "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz"
filename: "libsodium.tar.gz"
validation:
type: "sha256"
value: "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
- url: "http://ftp.gnu.org/gnu/bison/bison-3.5.4.tar.gz"
- url: "http://ftp.gnu.org/gnu/bison/bison-3.7.3.tar.gz"
filename: "bison.tar.gz"
validation:
type: "sha256"
value: "c0dd154dfaba63553a892d41dc400c7baa88cc06a1e2e27813fdd503715e4c28"
value: "104fe912f2212ab4e4a59df888a93b719a046ffc38d178e943f6c54b1f27b3c7"
- url: "https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz"
filename: "textinfo.tar.gz"
validation:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment