Skip to content

Commit

Permalink
Add cflags and ldflags for security and portability
Browse files Browse the repository at this point in the history
  • Loading branch information
@yosifkit
yosifkit committed Dec 5, 2016
1 parent c0bef1c commit cae3c03
Show file tree
Hide file tree
Showing 23 changed files with 92 additions and 0 deletions.
4 changes: 4 additions & 0 deletions 5.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 5.6/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3

ENV PHP_VERSION 5.6.28
Expand Down
4 changes: 4 additions & 0 deletions 7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.0/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763

ENV PHP_VERSION 7.0.13
Expand Down
4 changes: 4 additions & 0 deletions 7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"

This comment has been minimized.

Sign in to view

Copy link
@miglanc

miglanc Dec 8, 2016

@yosifkit

I don't know C and I don't understand the goal of this commit but with all respect to you and the contributing team I am sure it is an improvement to the image.

Unfortunately I have a problem with extending it.

I cannot install a C library named "librdkafka" that is required to install PHP client for Apache Kafka. I have described the issue here confluentinc/librdkafka#944 According to the contributor of this library the problem is with the external flags - exactly these that have been added with this commit.

Could you please consider the case and help me how can I solve this?

Thanks a lot in advance for any help!

This comment has been minimized.

Sign in to view

Copy link
@tianon

tianon Dec 10, 2016

Member

@miglanc would you be willing to join in the discussion on #347? 🙏
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions 7.1/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0

ENV PHP_VERSION 7.1.0
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS %%GPG_KEYS%%

ENV PHP_VERSION %%PHP_VERSION%%
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>##
##</autogenerated>##

ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
ENV CPPFLAGS="$CFLAGS"
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"

ENV GPG_KEYS %%GPG_KEYS%%

ENV PHP_VERSION %%PHP_VERSION%%
Expand Down

0 comments on commit cae3c03

Please sign in to comment.