xen-ops/laravel-base
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update depencies

Browse source 
- Update PHP to 8
- Update composer to 2.0
- Update Node (debian) to 14
This commit is contained in:
Jaysen Nuttall 2021-01-12 19:33:12 -07:00
commit 12b7aa8f2e
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -2,7 +2,7 @@ ARG PHP_VERSION
ARG PHP_INTERFACE ARG PHP_INTERFACE
ARG ARCHITECTURE_VERSION ARG ARCHITECTURE_VERSION
FROM composer:1.10 as composer FROM composer:2.0 as composer
FROM php:${PHP_VERSION}-${PHP_INTERFACE}-alpine${ARCHITECTURE_VERSION} as alpine FROM php:${PHP_VERSION}-${PHP_INTERFACE}-alpine${ARCHITECTURE_VERSION} as alpine
ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_ALLOW_SUPERUSER 1
@ -51,7 +51,7 @@ RUN apt update \
software-properties-common \ software-properties-common \
unzip \ unzip \
zlib1g-dev \ zlib1g-dev \
&& curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt update \ && apt update \
&& apt install --no-install-recommends -y \ && apt install --no-install-recommends -y \
libicu-dev \ libicu-dev \

22
Makefile
View file

@ -2,7 +2,7 @@
@echo 'Invalid target.' @echo 'Invalid target.'
@echo @echo
@echo ' Required ENV variables:' @echo ' Required ENV variables:'
@echo ' PHP_VERSION - the version of php to build, e.g., 7.4' @echo ' PHP_VERSION - the version of php to build, e.g., 8.0'
@echo ' PHP_INTERFACE - the type of php interface, e.g., apache, fpm' @echo ' PHP_INTERFACE - the type of php interface, e.g., apache, fpm'
@echo ' ARCHITECTURE_VERSION - the version of architecture, e.g., buster (for debian) or 3.12 (for alpine)' @echo ' ARCHITECTURE_VERSION - the version of architecture, e.g., buster (for debian) or 3.12 (for alpine)'
@echo ' (optional for alpine)' @echo ' (optional for alpine)'
@ -17,22 +17,10 @@
default: .DEFAULT default: .DEFAULT
all: all:
PHP_VERSION=7.3 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make debian PHP_VERSION=8.0 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make debian
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.3 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make push-debian REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=8.0 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make push-debian
PHP_VERSION=7.3 PHP_INTERFACE=apache ARCHITECTURE_VERSION=stretch make debian PHP_VERSION=8.0 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make alpine
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.3 PHP_INTERFACE=apache ARCHITECTURE_VERSION=stretch make push-debian REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=8.0 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make push-alpine
PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=buster make debian
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=buster make push-debian
PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=stretch make debian
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=stretch make push-debian
PHP_VERSION=7.4 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make debian
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.4 PHP_INTERFACE=apache ARCHITECTURE_VERSION=buster make push-debian
PHP_VERSION=7.4 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=buster make debian
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.4 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=buster make push-debian
PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make alpine
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.3 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make push-alpine
PHP_VERSION=7.4 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make alpine
REGISTRY=registry.xengul.com/xen/laravel-base PHP_VERSION=7.4 PHP_INTERFACE=fpm ARCHITECTURE_VERSION=3.12 make push-alpine
alpine: alpine:
BUILDKIT=1 docker build \ BUILDKIT=1 docker build \