Skip to content

Commit cae3c03

Browse files
yosifkityosifkit
committed
Add cflags and ldflags for security and portability
1 parent c0bef1c commit cae3c03

File tree

23 files changed

+92
-0
lines changed

23 files changed

+92
-0
lines changed

‎5.6/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3232
##<autogenerated>##
3333
##</autogenerated>##
3434

35+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
36+
ENV CPPFLAGS="$CFLAGS"
37+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
38+
3539
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
3640

3741
ENV PHP_VERSION 5.6.28

‎5.6/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3737
##<autogenerated>##
3838
##</autogenerated>##
3939

40+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
41+
ENV CPPFLAGS="$CFLAGS"
42+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
43+
4044
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
4145

4246
ENV PHP_VERSION 5.6.28

‎5.6/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
8888
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
8989
##</autogenerated>##
9090

91+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
92+
ENV CPPFLAGS="$CFLAGS"
93+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
94+
9195
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
9296

9397
ENV PHP_VERSION 5.6.28

‎5.6/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
3741

3842
ENV PHP_VERSION 5.6.28

‎5.6/fpm/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
4246

4347
ENV PHP_VERSION 5.6.28

‎5.6/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
3741

3842
ENV PHP_VERSION 5.6.28

‎5.6/zts/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
4246

4347
ENV PHP_VERSION 5.6.28

‎7.0/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3232
##<autogenerated>##
3333
##</autogenerated>##
3434

35+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
36+
ENV CPPFLAGS="$CFLAGS"
37+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
38+
3539
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
3640

3741
ENV PHP_VERSION 7.0.13

‎7.0/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3737
##<autogenerated>##
3838
##</autogenerated>##
3939

40+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
41+
ENV CPPFLAGS="$CFLAGS"
42+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
43+
4044
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
4145

4246
ENV PHP_VERSION 7.0.13

‎7.0/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
8888
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
8989
##</autogenerated>##
9090

91+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
92+
ENV CPPFLAGS="$CFLAGS"
93+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
94+
9195
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
9296

9397
ENV PHP_VERSION 7.0.13

‎7.0/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
3741

3842
ENV PHP_VERSION 7.0.13

‎7.0/fpm/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
4246

4347
ENV PHP_VERSION 7.0.13

‎7.0/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
3741

3842
ENV PHP_VERSION 7.0.13

‎7.0/zts/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
4246

4347
ENV PHP_VERSION 7.0.13

‎7.1/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3232
##<autogenerated>##
3333
##</autogenerated>##
3434

35+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
36+
ENV CPPFLAGS="$CFLAGS"
37+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
38+
3539
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
3640

3741
ENV PHP_VERSION 7.1.0

‎7.1/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3737
##<autogenerated>##
3838
##</autogenerated>##
3939

40+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
41+
ENV CPPFLAGS="$CFLAGS"
42+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
43+
4044
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
4145

4246
ENV PHP_VERSION 7.1.0

‎7.1/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
8888
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
8989
##</autogenerated>##
9090

91+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
92+
ENV CPPFLAGS="$CFLAGS"
93+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
94+
9195
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
9296

9397
ENV PHP_VERSION 7.1.0

‎7.1/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
3741

3842
ENV PHP_VERSION 7.1.0

‎7.1/fpm/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
4246

4347
ENV PHP_VERSION 7.1.0

‎7.1/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3333
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3434
##</autogenerated>##
3535

36+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
37+
ENV CPPFLAGS="$CFLAGS"
38+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
39+
3640
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
3741

3842
ENV PHP_VERSION 7.1.0

‎7.1/zts/alpine/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
3939
##</autogenerated>##
4040

41+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV CPPFLAGS="$CFLAGS"
43+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
44+
4145
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
4246

4347
ENV PHP_VERSION 7.1.0

‎Dockerfile-alpine.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3131
##<autogenerated>##
3232
##</autogenerated>##
3333

34+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
35+
ENV CPPFLAGS="$CFLAGS"
36+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
37+
3438
ENV GPG_KEYS %%GPG_KEYS%%
3539

3640
ENV PHP_VERSION %%PHP_VERSION%%

‎Dockerfile-debian.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
2626
##<autogenerated>##
2727
##</autogenerated>##
2828

29+
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
30+
ENV CPPFLAGS="$CFLAGS"
31+
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
32+
2933
ENV GPG_KEYS %%GPG_KEYS%%
3034

3135
ENV PHP_VERSION %%PHP_VERSION%%

0 commit comments

Comments
 (0)