diff --git a/Build/install.sh b/Build/install.sh index ff16ae59..afb71fdd 100644 --- a/Build/install.sh +++ b/Build/install.sh @@ -6,7 +6,7 @@ set -o errexit PROJECT_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" # The branch of TYPO3 to checkout (e.g. 'TYPO3_8-7', 'TYPO3_7-6') -: ${TYPO3="master"} +: ${TYPO3="v11"} : ${REPO="$(basename ${PROJECT_HOME})"} : ${PHP_BINARY="php"} diff --git a/Dockerfile b/Dockerfile index b8a9836f..1a4a95be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,18 +4,18 @@ # Build: # > docker build -t cundd/rest . # -# Build for TYPO3 7.6: -# > docker build -t cundd/rest --build-arg TYPO3=TYPO3_7-6 . +# Build for TYPO3 v10: +# > docker build -t cundd/rest --build-arg TYPO3=v10 . # # Run tests: -# > docker-compose run test +# > docker compose run test # -FROM php:7.3-cli +FROM php:8.1-cli # ----------------------------------------------------------------- # PREPARE THE OS -RUN apt-get update && apt-get install -y git zip mysql-client +RUN apt-get update && apt-get install -y git zip default-mysql-client RUN docker-php-ext-install opcache mysqli #RUN docker-php-ext-install iconv mcrypt zip opcache mysqli pdo_mysql gd @@ -29,8 +29,8 @@ RUN bash /app/Resources/Private/Scripts/composer-install.sh # ----------------------------------------------------------------- # INSTALL TYPO3 -# Install TYPO3 master branch -ARG TYPO3=master +# Install TYPO3 v11 +ARG TYPO3=v11 # MariaDB is linked as host "db" (see docker-composer.yml) ARG typo3DatabaseHost=db @@ -40,7 +40,6 @@ ENV typo3DatabaseHost=${typo3DatabaseHost} COPY ./Build /app/Build RUN bash /app/Build/install.sh install_typo3 && bash /app/Build/install.sh prepare_database -RUN ln -s /app/ /app/../TYPO3.CMS/typo3conf/ext/rest VOLUME /app