diff --git a/docker-compose.yml b/docker-compose.yml index 66d2fd4..9c8fc7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: typo3: container_name: ${TYPO3_CONTAINER_NAME:-typo3} - image: martinhelmich/typo3:${TYPO3_VERSION:-latest} + image: ${TYPO3_IMAGE:-martinhelmich/typo3}:${TYPO3_VERSION:-latest} restart: unless-stopped ports: - ${TYPO3_HOST_IP_ADDRESS:-127.0.0.1}:${TYPO3_HOST_PORT:-8001}:80 @@ -10,3 +10,6 @@ services: - ./fileadmin:/var/www/html/fileadmin - ./typo3conf:/var/www/html/typo3conf - ./uploads:/var/www/html/uploads + sysctls: + - net.ipv4.ip_unprivileged_port_start=0 + diff --git a/setup b/setup index 92f3b98..8b0f8a9 100755 --- a/setup +++ b/setup @@ -21,6 +21,7 @@ DELETE_CONFIG="" TYPO3_PROJECT_NAME="typo3_${DATE}" TYPO3_PROJECT_NAME_SUFFIX="" TYPO3_CONTAINER_NAME="${TYPO3_PROJECT_NAME}_core" +TYPO3_IMAGE="martinhelmich/typo3" TYPO3_VERSION="" TYPO3_HOST_IP_ADDRESS="" TYPO3_HOST_PORT="" @@ -43,6 +44,12 @@ if [ -f "config" ]; then fi if [ $CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_CONFIG == "n" ]; then + read -p "Would you like to use custom image 'b-eit/typo3'? (y/n)" USE_CUSTOM_IMAGE + if [ $USE_CUSTOM_IMAGE == "y" ]; then + echo "You have to build this image (with correct version you want to use) befor manualy with the build script!" + read -p "Have you done this? (ENTER)" + TYPO3_IMAGE="b-eit/typo3" + fi read -p "Enter typo3 version which should be used: " TYPO3_VERSION read -p "Enter host (vm) ip address on which typo3 should be accessible: " TYPO3_HOST_IP_ADDRESS read -p "Enter host (vm) port on which typo3 should be accessible: " TYPO3_HOST_PORT @@ -75,6 +82,12 @@ echo -n "Wait until typo3 is ready ..." echo -e "\nTypo3 is ready!" +if [ $DELETE_CONFIG == "y" ]; then + rm -f config + + echo "Config file 'config' deleted!" +fi + rm -f .env echo "Done!"