From 2a0b6be963fd6382edd12f2b426998824584f04b Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Fri, 18 Aug 2023 10:55:15 +0200 Subject: [PATCH] [INFRA] finalizing deployer config for easy use in pipelines --- src/7.4/src/Dockerfile | 9 +++------ src/8.0/src/Dockerfile | 9 +++------ src/8.1/src/Dockerfile | 9 +++------ src/8.2/src/Dockerfile | 9 +++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile index 8756e99..9cfaae3 100644 --- a/src/7.4/src/Dockerfile +++ b/src/7.4/src/Dockerfile @@ -164,17 +164,14 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -RUN set -xe; \ - \ - composer global require deployer/deployer; \ - composer global update; \ - ln -s ~/.composer/vendor/bin/dep /usr/local/bin/dep - # hadolint ignore=DL4006 RUN set -xe; \ \ /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \ + composer require deployer/deployer; \ + composer update; \ + echo "export PATH=$PATH:/var/www/html/vendor/bin" >> /etc/profile; \ /usr/local/bin/docker-layer-clean CMD ["php", "-a"] diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile index 15ee84c..94dd383 100644 --- a/src/8.0/src/Dockerfile +++ b/src/8.0/src/Dockerfile @@ -164,17 +164,14 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -RUN set -xe; \ - \ - composer global require deployer/deployer; \ - composer global update; \ - ln -s ~/.composer/vendor/bin/dep /usr/local/bin/dep - # hadolint ignore=DL4006 RUN set -xe; \ \ /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \ + composer require deployer/deployer; \ + composer update; \ + echo "export PATH=$PATH:/var/www/html/vendor/bin" >> /etc/profile; \ /usr/local/bin/docker-layer-clean CMD ["php", "-a"] diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile index 3cb585a..b260062 100644 --- a/src/8.1/src/Dockerfile +++ b/src/8.1/src/Dockerfile @@ -164,17 +164,14 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -RUN set -xe; \ - \ - composer global require deployer/deployer; \ - composer global update; \ - ln -s ~/.composer/vendor/bin/dep /usr/local/bin/dep - # hadolint ignore=DL4006 RUN set -xe; \ \ /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \ + composer require deployer/deployer; \ + composer update; \ + echo "export PATH=$PATH:/var/www/html/vendor/bin" >> /etc/profile; \ /usr/local/bin/docker-layer-clean CMD ["php", "-a"] diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index 9476380..365dd8d 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -164,17 +164,14 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -RUN set -xe; \ - \ - composer global require deployer/deployer; \ - composer global update; \ - ln -s ~/.composer/vendor/bin/dep /usr/local/bin/dep - # hadolint ignore=DL4006 RUN set -xe; \ \ /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \ + composer require deployer/deployer; \ + composer update; \ + echo "export PATH=$PATH:/var/www/html/vendor/bin" >> /etc/profile; \ /usr/local/bin/docker-layer-clean CMD ["php", "-a"]