Skip to content

GitLab

E
extensions.typo3.org
Commit bc113f7c authored by Thomas Löffler's avatar Thomas Löffler
Browse files
Options

Merge branch 'feature/remove_environment'

parents fb264413 1e6401e5
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 2123 deletions
.env deleted 100644 → 0
View file @ fb264413
TYPO3_SITENAME=TYPO3 Extension Repository
TYPO3_CONTEXT=Development
DATABASE_USER=t3o
DATABASE_USER_PASSWORD=k6mdcMp0MATlzKAE1RW6qFmmilqt2HNkQhbVgztu
DATABASE_HOST_NAME=db
DATABASE_PORT=3306
DATABASE_NAME=t3o
DATABASE_ROOT_PASSWORD=uf5c92eCULghtfdEdqH0hsfvnPSuEY7cnPKk5MAz
ADMIN_USER_NAME=t3o
ADMIN_PASSWORD=x2VsAVQNJd8UiDdu9a76
.gitignore
View file @ bc113f7c
......@@ -4,12 +4,12 @@ typo3_src
bin/*
!bin/scripts/
vendor
htdocs/fileadmin
htdocs/typo3temp
htdocs/uploads
htdocs/typo3
htdocs/index.php
htdocs/typo3conf/ext/*
htdocs/typo3conf/PackageStates.php
!htdocs/typo3conf/ext/ter*
html/fileadmin
html/typo3temp
html/uploads
html/typo3
html/index.php
html/typo3conf/ext/*
html/typo3conf/PackageStates.php
!html/typo3conf/ext/ter*
data/etc/solr/server/solr/mycores/t3o/data
Makefile deleted 100644 → 0
View file @ fb264413
# Makefile for t3o/ter
#
# Type 'make' for help.
#
DOCKER_COMPOSE="$$(pwd)/data/scripts/docker-compose.sh"
COMPOSER="$$(pwd)/data/scripts/composer.sh"
include .env
.PHONY: help
help:
@echo "Please use 'make <target>' where <target> is one of"
@echo " help to show this menu."
@echo " help2 for more help."
@echo " init for: composer-install, install-typo3"
@echo " reset for: kill, down, init"
@echo " pull docker-compose: Pull images for services."
@echo " build docker-compose: Build or rebuild services."
@echo " ps docker-compose: List containers."
@echo " up docker-compose: Build, (re)create, start, and attach"
@echo " to containers for a service."
@echo " down docker-compose: Stops containers and removes containers, networks,"
@echo " volumes, and images created by 'up'."
@echo " stop docker-compose: Stop running containers without removing them."
@echo " kill docker-compose: Force stop service containers."
@echo
@echo " install-typo3 docker-compose: Start TYPO3"
@echo " clear-cache Command Line: Empty typo3temp/"
@echo
@echo " log Constantly echo log items to the console."
@echo " composer-install PHP Composer: Install."
@echo " composer-update PHP Composer: Update."
@echo
@echo "Recommended:"
@echo " make init up log"
.PHONY: help2
help2:
@echo
@echo "help2"
@echo "====="
@echo
@echo "Once TYPO3 is running direct your browser to one of:"
@echo " https://ter.typo3.127.0.0.1.xip.io/typo3/"
@echo " https://ter.typo3.127.0.0.1.xip.io/typo3/sysext/install/Start/Install.php"
@echo
@echo "For a local installation it may be necessary to have file:"
@echo " ./data/typo3/html/typo3conf/AdditionalConfiguration.sample.php"
@echo "being active as file:"
@echo " ./data/typo3/html/typo3conf/AdditionalConfiguration.php"
@echo "Copy if necessary."
@echo
@echo "End of help2."
@echo
.PHONY: init
init: composer-install install-typo3
@echo
@echo "Direct your browser to:"
@echo " https://ter.typo3.127.0.0.1.xip.io/typo3/"
@echo
@echo "Type 'make help2' for more help."
@echo
.PHONY: reset
reset: kill down clear-cache init
.PHONY: pull
pull:
$(DOCKER_COMPOSE) pull
.PHONY: build
build:
$(DOCKER_COMPOSE) build --no-cache
.PHONY: ps
ps:
$(DOCKER_COMPOSE) ps
.PHONY: up
up:
$(DOCKER_COMPOSE) up -d
.PHONY: down
down:
$(DOCKER_COMPOSE) down --remove-orphans
.PHONY: stop
stop:
$(DOCKER_COMPOSE) stop
.PHONY: kill
kill:
$(DOCKER_COMPOSE) kill
.PHONY: install-typo3
install-typo3: up
$(DOCKER_COMPOSE) run --rm db /src/data/scripts/wait-for-it.sh -h $(DATABASE_HOST_NAME) -p $(DATABASE_PORT) -t 30
$(DOCKER_COMPOSE) run --rm php ./bin/typo3cms install:setup \
--non-interactive \
--force \
--database-user-name $(DATABASE_USER) \
--database-user-password $(DATABASE_USER_PASSWORD) \
--database-host-name $(DATABASE_HOST_NAME) \
--database-port $(DATABASE_PORT) \
--database-name $(DATABASE_NAME) \
--use-existing-database \
--admin-user-name $(ADMIN_USER_NAME) \
--admin-password $(ADMIN_PASSWORD) \
--site-name $(TYPO3_SITENAME) \
--site-setup-type site
.PHONY: log
log:
$(DOCKER_COMPOSE) logs -f --tail=100
.PHONY: composer-install
composer-install:
$(COMPOSER) --working-dir=data/typo3 install
.PHONY: composer-update
composer-update:
$(COMPOSER) --working-dir=data/typo3 up
.PHONY: clear-cache
clear-cache:
rm -rf data/typo3/html/typo3temp/*
README.md deleted 100644 → 0
View file @ fb264413
# TYPO3 Extension Repository
## ter.typo3.org
### Prerequisites
[docker engine](https://docs.docker.com/engine/installation/)
Make sure to have an instance of [jwilder/nginx-proxy](https://github.com/jwilder/nginx-proxy) running on your development box.
An easy way to get it up and running is using [torvitas/nginx-proxy-configuration](https://github.com/torvitas/docker-nginx-proxy-configuration).
### Quickstart
`
git clone https://git-t3o.typo3.org/t3o/ter.git
go in "ter" directory
make init up log
`
... and finally [click here](https://ter.typo3.127.0.0.1.xip.io)
### Composer
Example:
`
./data/scripts/composer.sh --working-dir=data/typo3/ info
`
For your convenience there are the following make jobs:
`
make composer-install
make composer-update
`
### Solr
To get the solr connection working, you need to add the "Search - Base Configuration (solr)" to the root template, and the "Initialize Solr Connections" in the "cache-menu" top right.
data/etc/nginx/default.conf deleted 100644 → 0
View file @ fb264413
access_log /proc/self/fd/1;
error_log /proc/self/fd/2;
server {
server_name ter.typo3.localhost;
listen 80;
index index.php index.html;
root /var/www/html/;
include /etc/nginx/conf.d/typo3.base;
}
data/etc/nginx/typo3.base deleted 100644 → 0
View file @ fb264413
location = /favicon.ico {
log_not_found off;
access_log off;
}