Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Départements-Notaires v2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nicolas PICARD
Départements-Notaires v2
Commits
47d374a9
Commit
47d374a9
authored
4 years ago
by
Cédric Girardot
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Jenkinsfile.review
+1
-1
1 addition, 1 deletion
Jenkinsfile.review
docker/lamp/Dockerfile
+10
-7
10 additions, 7 deletions
docker/lamp/Dockerfile
with
11 additions
and
8 deletions
Jenkinsfile.review
+
1
−
1
View file @
47d374a9
...
@@ -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"'
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
docker/lamp/Dockerfile
+
10
−
7
View file @
47d374a9
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment