Update for Laravel 6
Update composer to 1.9 Add unzip Alpine - Update alpine to 3.10 - Update node to 12.x Stretch - Update node to 12.x - Install yarn through npm instead of apt
This commit is contained in:
parent
90771e3d3c
commit
298e1162f5
2 changed files with 25 additions and 12 deletions
|
|
@ -9,6 +9,6 @@ before_script:
|
||||||
build-master:
|
build-master:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- REGISTRY=$CI_REGISTRY_IMAGE VERSION=5.8 make push
|
- REGISTRY=$CI_REGISTRY_IMAGE VERSION=6.0 make push
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
|
||||||
35
Dockerfile
35
Dockerfile
|
|
@ -1,16 +1,28 @@
|
||||||
FROM composer:1.8 as composer
|
FROM composer:1.9 as composer
|
||||||
|
|
||||||
|
|
||||||
FROM php:7.3-fpm-alpine3.9 as alpine
|
FROM php:7.3-fpm-alpine3.10 as alpine
|
||||||
COPY --from=composer /usr/bin/composer /usr/bin/composer
|
COPY --from=composer /usr/bin/composer /usr/bin/composer
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN apk add --no-cache bash icu icu-dev libxml2-dev libzip-dev nodejs-current nodejs-npm
|
RUN apk add --no-cache \
|
||||||
|
bash \
|
||||||
|
icu \
|
||||||
|
icu-dev \
|
||||||
|
libxml2-dev \
|
||||||
|
libzip-dev \
|
||||||
|
nodejs-current \
|
||||||
|
nodejs-npm \
|
||||||
|
unzip
|
||||||
RUN apk add --no-cache --virtual .node-build-deps \
|
RUN apk add --no-cache --virtual .node-build-deps \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
python \
|
python \
|
||||||
&& docker-php-ext-configure intl \
|
&& docker-php-ext-configure intl \
|
||||||
&& docker-php-ext-install -j$(nproc) intl opcache pdo_mysql zip \
|
&& docker-php-ext-install -j$(nproc) \
|
||||||
|
intl \
|
||||||
|
opcache \
|
||||||
|
pdo_mysql \
|
||||||
|
zip \
|
||||||
&& apk del .node-build-deps
|
&& apk del .node-build-deps
|
||||||
RUN npm install -g yarn
|
RUN npm install -g yarn
|
||||||
ENV PATH="/app:/app/vendor/bin:${PATH}"
|
ENV PATH="/app:/app/vendor/bin:${PATH}"
|
||||||
|
|
@ -31,21 +43,22 @@ RUN apt update \
|
||||||
gnupg \
|
gnupg \
|
||||||
libzip-dev \
|
libzip-dev \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
|
unzip \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
&& echo 'deb https://deb.nodesource.com/node_10.x stretch main' > /etc/apt/sources.list.d/nodesource.list \
|
&& curl -sL https://deb.nodesource.com/setup_12.x | bash - \
|
||||||
&& echo 'deb-src https://deb.nodesource.com/node_10.x stretch main' >> /etc/apt/sources.list.d/nodesource.list \
|
|
||||||
&& echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
|
|
||||||
&& curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
|
|
||||||
&& curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
|
|
||||||
&& apt update \
|
&& apt update \
|
||||||
&& apt install --no-install-recommends -y \
|
&& apt install --no-install-recommends -y \
|
||||||
libicu-dev \
|
libicu-dev \
|
||||||
nodejs \
|
nodejs \
|
||||||
npm \
|
npm \
|
||||||
yarn \
|
|
||||||
&& ln -s $(which nodejs) /usr/local/bin/node \
|
&& ln -s $(which nodejs) /usr/local/bin/node \
|
||||||
|
&& npm -g install yarn \
|
||||||
&& docker-php-ext-configure intl \
|
&& docker-php-ext-configure intl \
|
||||||
&& docker-php-ext-install -j$(nproc) intl opcache pdo_mysql zip \
|
&& docker-php-ext-install -j$(nproc) \
|
||||||
|
intl \
|
||||||
|
opcache \
|
||||||
|
pdo_mysql \
|
||||||
|
zip \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
ENV PATH="/app:/app/node_modules/.bin:/app/vendor/bin:${PATH}"
|
ENV PATH="/app:/app/node_modules/.bin:/app/vendor/bin:${PATH}"
|
||||||
COPY conf.d/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
|
COPY conf.d/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue