From c73213e3069801721a561214f4e1df208f4641f4 Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Tue, 15 Aug 2023 16:54:51 +0200 Subject: [PATCH] [INFRA] make deployer a global cli --- src/7.4/src/Dockerfile | 10 +++++++--- src/8.0/src/Dockerfile | 10 +++++++--- src/8.1/src/Dockerfile | 10 +++++++--- src/8.2/src/Dockerfile | 10 +++++++--- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile index 7d4d620..19e382f 100644 --- a/src/7.4/src/Dockerfile +++ b/src/7.4/src/Dockerfile @@ -150,9 +150,7 @@ RUN set -xe; \ ################################################ curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \ chmod +x /usr/local/bin/magerun2; \ - /usr/local/bin/docker-layer-clean; \ - echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \ - echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc + /usr/local/bin/docker-layer-clean WORKDIR /var/www/html ENTRYPOINT ["docker-entrypoint"] @@ -166,6 +164,12 @@ 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; \ + echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc + # hadolint ignore=DL4006 RUN set -xe; \ \ diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile index 82e8841..92b347a 100644 --- a/src/8.0/src/Dockerfile +++ b/src/8.0/src/Dockerfile @@ -150,9 +150,7 @@ RUN set -xe; \ ################################################ curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \ chmod +x /usr/local/bin/magerun2; \ - /usr/local/bin/docker-layer-clean; \ - echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \ - echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc + /usr/local/bin/docker-layer-clean WORKDIR /var/www/html ENTRYPOINT ["docker-entrypoint"] @@ -166,6 +164,12 @@ 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; \ + echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc + # hadolint ignore=DL4006 RUN set -xe; \ \ diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile index 8598ee1..bd218ce 100644 --- a/src/8.1/src/Dockerfile +++ b/src/8.1/src/Dockerfile @@ -150,9 +150,7 @@ RUN set -xe; \ ################################################ curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \ chmod +x /usr/local/bin/magerun2; \ - /usr/local/bin/docker-layer-clean; \ - echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \ - echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc + /usr/local/bin/docker-layer-clean WORKDIR /var/www/html ENTRYPOINT ["docker-entrypoint"] @@ -166,6 +164,12 @@ 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; \ + echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc + # hadolint ignore=DL4006 RUN set -xe; \ \ diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index bcc12ef..45f29b6 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -150,9 +150,7 @@ RUN set -xe; \ ################################################ curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \ chmod +x /usr/local/bin/magerun2; \ - /usr/local/bin/docker-layer-clean; \ - echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \ - echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc + /usr/local/bin/docker-layer-clean WORKDIR /var/www/html ENTRYPOINT ["docker-entrypoint"] @@ -166,6 +164,12 @@ 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; \ + echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc + # hadolint ignore=DL4006 RUN set -xe; \ \