mirror of
https://github.com/archtechx/tenancy.git
synced 2025-12-12 09:54:03 +00:00
Laravel 11 support + Docker improvements (#29)
* wip * bump jobpipeline dependency * bump pest dependency * fix composer.json syntax * minor changes to docker setup * more docker changes * compact pest output, remove unnecessary env vars from composer.json * minor pest tweaks * mssql fix * try enabling colors in CI * try setting --columns=max for pest in CI * try setting columns using env var instead of --columns in CI * Revert "try setting columns using env var instead of --columns in CI" This reverts commit eb3c177aefa97b0a3140d7f0e89c5012a854ff42. * replace --compact with --no-progress * try setting a hardcoded columns value in CI * remove --columns (doesn't work), add back --compact * try setting COLUMNS to a hardcoded value in CI * remove alternative env syntax from CI * fix PrefixCacheBootstrapperTest on L11, skip on L10 * add one more skip() call * fix validate.yml * Simplify schema dump, skip dump-related tests in L10 * Rename 'dump' table to 'example' * Bring schema dump-related tests together, add comments * Merge schema path-related tests into one, add comments * Rename dataset parameter --------- Co-authored-by: lukinovec <lukinovec@gmail.com>
This commit is contained in:
parent
d2ab2dacf2
commit
32a063b834
16 changed files with 135 additions and 178 deletions
17
Dockerfile
17
Dockerfile
|
|
@ -1,7 +1,7 @@
|
|||
# add amd64 platform to support Mac M1
|
||||
FROM --platform=linux/amd64 shivammathur/node:latest-amd64
|
||||
FROM shivammathur/node:latest
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
|
||||
ARG PHP_VERSION=8.2
|
||||
ARG PHP_VERSION=8.3
|
||||
|
||||
WORKDIR /var/www/html
|
||||
|
||||
|
|
@ -9,13 +9,18 @@ WORKDIR /var/www/html
|
|||
ENV TZ=Europe/London
|
||||
ENV LANG=en_GB.UTF-8
|
||||
|
||||
# install MYSSQL ODBC Driver
|
||||
# install MSSQL ODBC driver (1/2)
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y gnupg2 \
|
||||
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
|
||||
&& curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list \
|
||||
&& apt-get update \
|
||||
&& ACCEPT_EULA=Y apt-get install -y unixodbc-dev=2.3.7 unixodbc=2.3.7 odbcinst1debian2=2.3.7 odbcinst=2.3.7 msodbcsql17
|
||||
&& apt-get update
|
||||
|
||||
# install MSSQL ODBC driver (2/2)
|
||||
RUN if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; \
|
||||
then ACCEPT_EULA=Y apt-get install -y unixodbc-dev msodbcsql18; \
|
||||
else ACCEPT_EULA=Y apt-get install -y unixodbc-dev=2.3.7 unixodbc=2.3.7 odbcinst1debian2=2.3.7 odbcinst=2.3.7 msodbcsql17; \
|
||||
fi
|
||||
|
||||
# set PHP version
|
||||
RUN update-alternatives --set php /usr/bin/php$PHP_VERSION \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue