From 47d374a9345be27857ce516ca864f50ebf5b77ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Girardot?= <cgi@atolcd.com>
Date: Mon, 9 Nov 2020 11:01:56 +0100
Subject: [PATCH] Build Jenkins : Force utilisation de composer 1
Change-Id: I5e183cfd46de829f5d5838029647aecf7a2f51e6
---
Jenkinsfile.review | 2 +-
docker/lamp/Dockerfile | 17 ++++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile.review b/Jenkinsfile.review
index b0934364..38d5865d 100644
--- a/Jenkinsfile.review
+++ b/Jenkinsfile.review
@@ -13,7 +13,7 @@ pipeline {
dockerfile {
filename 'Dockerfile'
dir './docker/lamp'
- additionalBuildArgs '--build-arg PHP_VERSION=7.2'
+ additionalBuildArgs '--build-arg PHP_VERSION=7.2 --build-arg COMPOSER_VERSION=1.10'
args '-u root --privileged -e TZ="Europe/Paris" -v "/var/lib/jenkins/composer/auth.json:/home/.composer/auth.json" -v "/var/run/docker.sock:/var/run/docker.sock"'
}
}
diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile
index 9c22ffca..4d476072 100644
--- a/docker/lamp/Dockerfile
+++ b/docker/lamp/Dockerfile
@@ -1,5 +1,14 @@
+ARG COMPOSER_VERSION
+ARG PHP_VERSION
+
+FROM composer:${COMPOSER_VERSION} AS composer
+
FROM ubuntu:18.04
+ARG PHP_VERSION
+
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
ENV BOOT2DOCKER_ID 1000
ENV BOOT2DOCKER_GID 50
@@ -72,12 +81,6 @@ RUN rm -rf /var/lib/mysql
# Add MySQL utils
ADD files/create_mysql_users.sh /create_mysql_users.sh
-# Add composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
- php composer-setup.php && \
- php -r "unlink('composer-setup.php');" && \
- mv composer.phar /usr/local/bin/composer
-
# config to enable .htaccess
ADD files/apache_default /etc/apache2/sites-available/000-default.conf
RUN a2enmod rewrite
@@ -88,7 +91,7 @@ RUN mkdir -p /app && rm -fr /var/www/html && ln -s /app /var/www/html
#Environment variables to configure php
ENV PHP_UPLOAD_MAX_FILESIZE 10M
ENV PHP_POST_MAX_SIZE 10M
-ENV PHP_VERSION 7.2
+ENV PHP_VERSION $PHP_VERSION
# Install Cypress
RUN yarn global add --pure-lockfile cypress@5.1.0;
--
GitLab