Commit 4c619723 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Update ddev to 1.5.0 and change stage server for deployment

parent 691785ff
Pipeline #5930 passed with stages
in 2 minutes and 53 seconds
...@@ -3,3 +3,6 @@ ...@@ -3,3 +3,6 @@
/import.yaml /import.yaml
/docker-compose.yaml /docker-compose.yaml
/db_snapshots /db_snapshots
/sequelpro.spf
/import-db
/.bgsync*
APIVersion: v1.3.0 APIVersion: v1.5.0
name: my.typo3.org name: my.typo3.org
type: typo3 type: typo3
docroot: html docroot: public
php_version: "7.0" php_version: "7.2"
webserver_type: nginx-fpm webserver_type: nginx-fpm
router_http_port: "80" router_http_port: "80"
router_https_port: "443" router_https_port: "443"
xdebug_enabled: false xdebug_enabled: false
additional_hostnames: [] additional_hostnames: []
additional_fqdns: [] additional_fqdns: []
mariadb_version: "10.1"
webcache_enabled: false
provider: default provider: default
hooks: hooks:
post-start: post-start:
- exec: sudo apt-get update - exec: sudo apt-get update
- exec: sudo apt-get install php7.0-ldap -y - exec: sudo apt-get install php7.2-ldap -y
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php - exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php
- exec: composer install -d /var/www/html - exec: composer install
- exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix private/typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build
- exec: ../vendor/bin/typo3cms install:generatepackagestates - exec: vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible - exec: vendor/bin/typo3cms install:extensionsetupifpossible
# This config.yaml was created with ddev version v1.3.0 # This config.yaml was created with ddev version v1.5.0
# webimage: drud/ddev-webserver:v1.3.0 # webimage: drud/ddev-webserver:v1.5.0
dbimage: drud/ddev-dbserver:v1.2.0 # dbimage: drud/ddev-dbserver:v1.5.0-10.2
# dbaimage: drud/phpmyadmin:v1.3.0 # dbaimage: drud/phpmyadmin:v1.5.0
# bgsyncimage: drud/ddev-bgsync:v1.5.0
# However we do not recommend explicitly wiring these images into the # However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev. # config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'. # You can update this config.yaml using 'ddev config'.
...@@ -39,7 +42,7 @@ dbimage: drud/ddev-dbserver:v1.2.0 ...@@ -39,7 +42,7 @@ dbimage: drud/ddev-dbserver:v1.2.0
# docroot: <relative_path> # Relative path to the directory containing index.php. # docroot: <relative_path> # Relative path to the directory containing index.php.
# php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2" # php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3"
# You can explicitly specify the webimage, dbimage, dbaimage lines but this # You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior, # is not recommended, as the images are often closely tied to ddev's' behavior,
...@@ -48,6 +51,7 @@ dbimage: drud/ddev-dbserver:v1.2.0 ...@@ -48,6 +51,7 @@ dbimage: drud/ddev-dbserver:v1.2.0
# webimage: <docker_image> # nginx/php docker image. # webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image. # dbimage: <docker_image> # mariadb docker image.
# dbaimage: <docker_image> # dbaimage: <docker_image>
# bgsyncimage: <docker_image>
# router_http_port: <port> # Port to be used for http (defaults to port 80) # router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443) # router_https_port: <port> # Port for https (defaults to 443)
...@@ -71,13 +75,27 @@ dbimage: drud/ddev-dbserver:v1.2.0 ...@@ -71,13 +75,27 @@ dbimage: drud/ddev-dbserver:v1.2.0
# upload_dir: custom/upload/dir # upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to custom/upload/dir. # would set the destination path for ddev import-files to custom/upload/dir.
# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.
# omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# only those two containers can be omitted here.
# Note that these containers can also be omitted globally in the
# ~/.ddev/global_config.yaml or with the "ddev config global" command.
# provider: default # Currently either "default" or "pantheon" # provider: default # Currently either "default" or "pantheon"
# #
# Many ddev commands can be extended to run tasks after the ddev command is # Many ddev commands can be extended to run tasks after the ddev command is
# executed. # executed.
# See https://ddev.readthedocs.io/en/latest/users/extending-commands/ for more # See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define # information on the commands that can be extended and the tasks you can define
# for them. Example: # for them. Example:
#hooks: #hooks:
# post-start: # post-start:
# - exec: composer install -d /var/www/html # - exec: composer install -d /var/www/html
\ No newline at end of file
vendor /vendor/
html /public/
!html/humans.txt !/public/humans.txt
private /private/
!private/typo3conf/LocalConfiguration.php !/private/typo3conf/LocalConfiguration.php
!private/typo3conf/AdditionalConfiguration.ddev.php !/private/typo3conf/AdditionalConfiguration.ddev.php
!private/typo3conf/.gitignore !/private/typo3conf/.gitignore
/auth.json /auth.json
.php_cs.cache /.php_cs.cache
.ddev/db_snapshots /.ddev/db_snapshots
.ddev/sequelpro.spf /.ddev/sequelpro.spf
.data /.data
.idea /.idea
include: 'https://git-t3o.typo3.org/t3o/t3olayout/raw/develop/Configuration/GitLab/t3o-builds.yml' include: 'https://git-t3o.typo3.org/t3o/t3olayout/raw/master/Configuration/GitLab/t3o-builds.yml'
variables: variables:
GIT_STRATEGY: "none" GIT_STRATEGY: "none"
GIT_SSL_NO_VERIFY: "true" GIT_SSL_NO_VERIFY: "true"
STAGE_PORT: 22191 STAGE_PORT: 22200
STAGE_HOST: "my-stage.typo3.org" STAGE_HOST: "my-stage-v9.typo3.org"
PRODUCTION_PORT: 22193 PRODUCTION_PORT: 22193
PRODUCTION_HOST: "my.typo3.org" PRODUCTION_HOST: "my.typo3.org"
DUMP_USER: "mystage" DUMP_USER: "mystage"
......
...@@ -6,22 +6,20 @@ require_once '/composer/vendor/deployer/deployer/recipe/common.php'; ...@@ -6,22 +6,20 @@ require_once '/composer/vendor/deployer/deployer/recipe/common.php';
require_once '/composer/vendor/deployer/recipes/rsync.php'; require_once '/composer/vendor/deployer/recipes/rsync.php';
$sharedDirectories = [ $sharedDirectories = [
'html/fileadmin', 'private/fileadmin',
'html/uploads', 'private/uploads',
'html/.well-known' 'public/.well-known'
]; ];
set('shared_dirs', $sharedDirectories); set('shared_dirs', $sharedDirectories);
$sharedFiles = [ $sharedFiles = [
'html/typo3conf/AdditionalConfiguration.php', 'private/typo3conf/AdditionalConfiguration.php',
'.cachetool.yml' '.cachetool.yml'
]; ];
set('shared_files', $sharedFiles); set('shared_files', $sharedFiles);
$writeableDirectories = [ $writeableDirectories = [
'html/typo3temp', 'private/typo3temp',
'html/fileadmin',
'html/uploads'
]; ];
set('writable_dirs', $writeableDirectories); set('writable_dirs', $writeableDirectories);
...@@ -52,16 +50,16 @@ set('rsync', [ ...@@ -52,16 +50,16 @@ set('rsync', [
set('rsync_src', './'); set('rsync_src', './');
set('keep_releases', 10); set('keep_releases', 10);
serverList('./.gitlab-ci/deployer/servers.yml'); serverList('./.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php70/bin/php'); set('php', '/opt/php/php72/bin/php');
set('typo3_console', 'vendor/bin/typo3cms'); set('vendor_folder', 'vendor/bin/');
task('typo3', function () { task('typo3', function () {
run('cd {{release_path}} && {{php}} {{typo3_console}} install:generatepackagestates'); run('cd {{release_path}} && {{php}} {{vendor_folder}}typo3cms install:generatepackagestates');
run('cd {{release_path}} && {{php}} {{typo3_console}} install:extensionsetupifpossible'); run('cd {{release_path}} && {{php}} {{vendor_folder}}typo3cms install:extensionsetupifpossible');
}); });
task('cache', function () { task('cache', function () {
run('cd {{release_path}} && {{php}} vendor/bin/cachetool opcache:reset'); run('cd {{release_path}} && {{php}} {{vendor_folder}}cachetool opcache:reset');
}); });
task('deploy', [ task('deploy', [
......
...@@ -7,8 +7,9 @@ master: ...@@ -7,8 +7,9 @@ master:
deploy_path: ~/ci deploy_path: ~/ci
develop: develop:
stage: stage stage: stage
host: my-stage.typo3.org host: my-stage-v9.typo3.org
port: 22191 port: 22200
user: mystage user: mystage
writable_mode: chmod
forward_agent: true forward_agent: true
deploy_path: ~/ci/ deploy_path: ~/ci/
Subproject commit 57323530b0771c5575efb38d64d1bf117716ebf5
[submodule ".gitlab-ci/scripts"]
path = .gitlab-ci/scripts
url = https://github.com/torvitas/docker-scripts.git
...@@ -44,20 +44,20 @@ ...@@ -44,20 +44,20 @@
}, },
{ {
"name": "causal/ig_ldap_sso_auth", "name": "causal/ig_ldap_sso_auth",
"version": "3.3.0", "version": "3.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/xperseguers/t3ext-ig_ldap_sso_auth.git", "url": "https://github.com/xperseguers/t3ext-ig_ldap_sso_auth.git",
"reference": "75628b479708f9a21c701cc00389d3986ce7831d" "reference": "056876af8c0fb28efa11591e447b5d9b242eae5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/75628b479708f9a21c701cc00389d3986ce7831d", "url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/056876af8c0fb28efa11591e447b5d9b242eae5b",
"reference": "75628b479708f9a21c701cc00389d3986ce7831d", "reference": "056876af8c0fb28efa11591e447b5d9b242eae5b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">= 5.5.0, <= 7.1.99", "php": ">= 5.5.0, <= 7.2.99",
"typo3/cms-core": ">= 7.6.0, <= 8.7.99" "typo3/cms-core": ">= 7.6.0, <= 8.7.99"
}, },
"replace": { "replace": {
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPL-2.0+" "GPL-2.0-or-later"
], ],
"authors": [ "authors": [
{ {
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
"ldap", "ldap",
"openldap" "openldap"
], ],
"time": "2018-01-16T16:33:27+00:00" "time": "2018-12-26T09:55:08+00:00"
}, },
{ {
"name": "cogpowered/finediff", "name": "cogpowered/finediff",
......
/* TEAM */
Project Lead: Thomas Löffler
Twitter: @spooner_web
Site: https://spooner-web.de/
GitHub: https://github.com/spoonerWeb
From: Stuttgart, Germany
Project Owner: Stefan Busemann
Twitter: @in2code_stefan
Site: https://www.in2code.de/
From: Rosenheim, Germany
Contributor: Camille Meunier
From: Lyon, France
Contributor: Xavier Ley
Twitter: @xavier_ley
From: Lyon, France
/* THANKS */
<role>: <name>
Twitter: @<yourname>
From: <city>, <state>, <country>
<role>: <name>
Twitter: @<yourname>
From: <city>, <state>, <country>
/* SITE */
Last update: 2017/07/14
Language: English
Doctype: HTML5
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment