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:
Jaysen 2019-10-17 19:47:42 -06:00
commit 298e1162f5
2 changed files with 25 additions and 12 deletions

View file

@ -9,6 +9,6 @@ before_script:
build-master:
stage: build
script:
- REGISTRY=$CI_REGISTRY_IMAGE VERSION=5.8 make push
- REGISTRY=$CI_REGISTRY_IMAGE VERSION=6.0 make push
only:
- master

View file

@ -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
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 \
g++ \
make \
python \
&& 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
RUN npm install -g yarn
ENV PATH="/app:/app/vendor/bin:${PATH}"
@ -31,21 +43,22 @@ RUN apt update \
gnupg \
libzip-dev \
software-properties-common \
unzip \
zlib1g-dev \
&& echo 'deb https://deb.nodesource.com/node_10.x stretch main' > /etc/apt/sources.list.d/nodesource.list \
&& 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 - \
&& curl -sL https://deb.nodesource.com/setup_12.x | bash - \
&& apt update \
&& apt install --no-install-recommends -y \
libicu-dev \
nodejs \
npm \
yarn \
&& ln -s $(which nodejs) /usr/local/bin/node \
&& npm -g install yarn \
&& 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/*
ENV PATH="/app:/app/node_modules/.bin:/app/vendor/bin:${PATH}"
COPY conf.d/opcache.ini /usr/local/etc/php/conf.d/opcache.ini