Merge pull request #52 from webvisum/main

[INFRA] finalizing deployer config for easy use in pipelines
OpenMage · Aug 18, 2023 · 8aefdf9 · 8aefdf9
2 parents 7439567 + 2a0b6be
commit 8aefdf9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"]