Skip to content

Commit

Permalink
Update Dockerfile and install script
Browse files Browse the repository at this point in the history
  • Loading branch information
cundd committed Apr 25, 2023
1 parent d56b537 commit ccc9234
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Build/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
15 changes: 7 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down

0 comments on commit ccc9234

Please sign in to comment.