Skip to content
Snippets Groups Projects
Commit 47d374a9 authored by Cédric Girardot's avatar Cédric Girardot
Browse files

Build Jenkins : Force utilisation de composer 1

Change-Id: I5e183cfd46de829f5d5838029647aecf7a2f51e6
parent 249c1e40
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ pipeline { ...@@ -13,7 +13,7 @@ pipeline {
dockerfile { dockerfile {
filename 'Dockerfile' filename 'Dockerfile'
dir './docker/lamp' 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"' 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"'
} }
} }
......
ARG COMPOSER_VERSION
ARG PHP_VERSION
FROM composer:${COMPOSER_VERSION} AS composer
FROM ubuntu:18.04 FROM ubuntu:18.04
ARG PHP_VERSION
COPY --from=composer /usr/bin/composer /usr/local/bin/composer
ENV BOOT2DOCKER_ID 1000 ENV BOOT2DOCKER_ID 1000
ENV BOOT2DOCKER_GID 50 ENV BOOT2DOCKER_GID 50
...@@ -72,12 +81,6 @@ RUN rm -rf /var/lib/mysql ...@@ -72,12 +81,6 @@ RUN rm -rf /var/lib/mysql
# Add MySQL utils # Add MySQL utils
ADD files/create_mysql_users.sh /create_mysql_users.sh 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 # config to enable .htaccess
ADD files/apache_default /etc/apache2/sites-available/000-default.conf ADD files/apache_default /etc/apache2/sites-available/000-default.conf
RUN a2enmod rewrite RUN a2enmod rewrite
...@@ -88,7 +91,7 @@ RUN mkdir -p /app && rm -fr /var/www/html && ln -s /app /var/www/html ...@@ -88,7 +91,7 @@ RUN mkdir -p /app && rm -fr /var/www/html && ln -s /app /var/www/html
#Environment variables to configure php #Environment variables to configure php
ENV PHP_UPLOAD_MAX_FILESIZE 10M ENV PHP_UPLOAD_MAX_FILESIZE 10M
ENV PHP_POST_MAX_SIZE 10M ENV PHP_POST_MAX_SIZE 10M
ENV PHP_VERSION 7.2 ENV PHP_VERSION $PHP_VERSION
# Install Cypress # Install Cypress
RUN yarn global add --pure-lockfile cypress@5.1.0; RUN yarn global add --pure-lockfile cypress@5.1.0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment