Skip to content

Commit 3942ea6

Browse files
f3l1xf3l1x
committed
PHP: use apt instead of apt-get
1 parent b2d40b7 commit 3942ea6

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎php/5.6-fpm/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ENV BLACKFIRE_CLI=1.9.4
2828
ENV BLACKFIRE_PROBE=1.15.0
2929

3030
# INSTALLATION
31-
RUN apt-get update && apt-get dist-upgrade -y && \
31+
RUN apt update && apt dist-upgrade -y && \
3232
# DEPENDENCIES #############################################################
33-
apt-get install -y wget curl git bash-completion apt-transport-https ca-certificates && \
33+
apt install -y wget curl git bash-completion apt-transport-https ca-certificates && \
3434
# COMPLETION ###############################################################
3535
cp /etc/skel/.bashrc ~/ && \
3636
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
@@ -39,8 +39,8 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3939
# PHP DEB.SURY.CZ ##########################################################
4040
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
4141
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
42-
apt-get update && \
43-
apt-get install -y --no-install-recommends \
42+
apt update && \
43+
apt install -y --no-install-recommends \
4444
php5.6-apcu \
4545
php5.6-bcmath \
4646
php5.6-cli \
@@ -88,7 +88,7 @@ RUN apt-get update && apt-get dist-upgrade -y && \
8888
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CGI_CONF_DIR}/999-devstack.ini && \
8989
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_FPM_CONF_DIR}/999-devstack.ini && \
9090
# CLEAN UP #################################################################
91-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
91+
apt clean -y && apt autoclean -y && apt autoremove -y && \
9292
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
9393

9494
# FILES

‎php/5.6/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ENV BLACKFIRE_CLI=1.9.4
2626
ENV BLACKFIRE_PROBE=1.15.0
2727

2828
# INSTALLATION
29-
RUN apt-get update && apt-get dist-upgrade -y && \
29+
RUN apt update && apt dist-upgrade -y && \
3030
# DEPENDENCIES #############################################################
31-
apt-get install -y wget curl git bash-completion apt-transport-https ca-certificates && \
31+
apt install -y wget curl git bash-completion apt-transport-https ca-certificates && \
3232
# COMPLETION ###############################################################
3333
cp /etc/skel/.bashrc ~/ && \
3434
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
@@ -37,8 +37,8 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3737
# PHP DEB.SURY.CZ ##########################################################
3838
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
3939
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
40-
apt-get update && \
41-
apt-get install -y --no-install-recommends \
40+
apt update && \
41+
apt install -y --no-install-recommends \
4242
php5.6-apcu \
4343
php5.6-bcmath \
4444
php5.6-cli \
@@ -83,7 +83,7 @@ RUN apt-get update && apt-get dist-upgrade -y && \
8383
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CLI_CONF_DIR}/999-devstack.ini && \
8484
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CGI_CONF_DIR}/999-devstack.ini && \
8585
# CLEAN UP #################################################################
86-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
86+
apt clean -y && apt autoclean -y && apt autoremove -y && \
8787
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
8888

8989
# FILES

‎php/7.1-fpm/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ENV BLACKFIRE_CLI=1.9.4
2828
ENV BLACKFIRE_PROBE=1.15.0
2929

3030
# INSTALLATION
31-
RUN apt-get update && apt-get dist-upgrade -y && \
31+
RUN apt update && apt dist-upgrade -y && \
3232
# DEPENDENCIES #############################################################
33-
apt-get install -y wget curl git bash-completion apt-transport-https ca-certificates && \
33+
apt install -y wget curl git bash-completion apt-transport-https ca-certificates && \
3434
# COMPLETION ###############################################################
3535
cp /etc/skel/.bashrc ~/ && \
3636
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
@@ -39,8 +39,8 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3939
# PHP DEB.SURY.CZ ##########################################################
4040
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
4141
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
42-
apt-get update && \
43-
apt-get install -y --no-install-recommends \
42+
apt update && \
43+
apt install -y --no-install-recommends \
4444
php7.1-apc \
4545
php7.1-apcu \
4646
php7.1-bcmath \
@@ -93,7 +93,7 @@ RUN apt-get update && apt-get dist-upgrade -y && \
9393
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CGI_CONF_DIR}/999-devstack.ini && \
9494
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_FPM_CONF_DIR}/999-devstack.ini && \
9595
# CLEAN UP #################################################################
96-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
96+
apt clean -y && apt autoclean -y && apt autoremove -y && \
9797
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
9898

9999
# FILES

‎php/7.1/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ENV BLACKFIRE_CLI=1.9.4
2626
ENV BLACKFIRE_PROBE=1.15.0
2727

2828
# INSTALLATION
29-
RUN apt-get update && apt-get dist-upgrade -y && \
29+
RUN apt update && apt dist-upgrade -y && \
3030
# DEPENDENCIES #############################################################
31-
apt-get install -y wget curl git bash-completion apt-transport-https ca-certificates && \
31+
apt install -y wget curl git bash-completion apt-transport-https ca-certificates && \
3232
# COMPLETION ###############################################################
3333
cp /etc/skel/.bashrc ~/ && \
3434
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
@@ -37,8 +37,8 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3737
# PHP DEB.SURY.CZ ##########################################################
3838
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
3939
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
40-
apt-get update && \
41-
apt-get install -y --no-install-recommends \
40+
apt update && \
41+
apt install -y --no-install-recommends \
4242
php7.1-apc \
4343
php7.1-apcu \
4444
php7.1-bcmath \
@@ -88,7 +88,7 @@ RUN apt-get update && apt-get dist-upgrade -y && \
8888
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CLI_CONF_DIR}/999-devstack.ini && \
8989
ln -s ${PHP_MODS_DIR}/devstack.ini ${PHP_CGI_CONF_DIR}/999-devstack.ini && \
9090
# CLEAN UP #################################################################
91-
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
91+
apt clean -y && apt autoclean -y && apt autoremove -y && \
9292
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
9393

9494
# FILES

0 commit comments

Comments
 (0)