Remove "-fpie" -- causes compilation downstream failures

See docker-library#347 (comment).
infosiftr · Dec 12, 2016 · 603e1f9 · 603e1f9
1 parent 35080cc
commit 603e1f9
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 46 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -33,12 +33,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
@@ -38,12 +38,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
@@ -89,12 +89,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/zts/Dockerfile b/5.6/zts/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -33,12 +33,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
@@ -38,12 +38,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
@@ -89,12 +89,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/zts/Dockerfile b/7.0/zts/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -33,12 +33,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile
@@ -38,12 +38,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile
@@ -89,12 +89,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/zts/Dockerfile b/7.1/zts/Dockerfile
@@ -34,12 +34,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile
@@ -39,12 +39,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -32,12 +32,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
 

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -27,12 +27,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
 # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
 # Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
 # https://github.com/docker-library/php/issues/272
-ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV CFLAGS="-fstack-protector-strong -fpic -O2"
 ENV CPPFLAGS="$CFLAGS"
 ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"