From 9067f7dcc166ce1784a6e3aec4f1bcb71cec7e45 Mon Sep 17 00:00:00 2001 From: Aleksander Cynarski Date: Sun, 17 Oct 2021 23:36:54 +0200 Subject: [PATCH] projet_setup --- .drone.yml | 128 ++++++++++++++--------------- docker/usr/local/bin/project_setup | 4 +- 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/.drone.yml b/.drone.yml index 629cbba..eba45fa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,22 +2,22 @@ kind: pipeline name: default steps: -- name: php8.1-rc - image: plugins/docker - settings: - username: - from_secret: hub_username - password: - from_secret: hub_password - repo: - from_secret: hub_repo - build_args: - - PHP_VERSION=8.1-rc-fpm-alpine3.13 - tags: 8.1-rc-alpine - when: - branch: - - master - depends_on: [ clone ] +# - name: php8.1-rc +# image: plugins/docker +# settings: +# username: +# from_secret: hub_username +# password: +# from_secret: hub_password +# repo: +# from_secret: hub_repo +# build_args: +# - PHP_VERSION=8.1-rc-fpm-alpine3.13 +# tags: 8.1-rc-alpine +# when: +# branch: +# - master +# depends_on: [ clone ] - name: php8.0 image: plugins/docker @@ -36,53 +36,53 @@ steps: - master depends_on: [ clone ] -- name: php7.4 - image: plugins/docker - settings: - username: - from_secret: hub_username - password: - from_secret: hub_password - repo: - from_secret: hub_repo - build_args: - - PHP_VERSION=7.4-fpm-alpine3.13 - tags: 7.4-alpine - when: - branch: - - master - depends_on: [ clone ] +# - name: php7.4 +# image: plugins/docker +# settings: +# username: +# from_secret: hub_username +# password: +# from_secret: hub_password +# repo: +# from_secret: hub_repo +# build_args: +# - PHP_VERSION=7.4-fpm-alpine3.13 +# tags: 7.4-alpine +# when: +# branch: +# - master +# depends_on: [ clone ] -- name: php7.3 - image: plugins/docker - settings: - username: - from_secret: hub_username - password: - from_secret: hub_password - repo: - from_secret: hub_repo - build_args: - - PHP_VERSION=7.3-fpm-alpine3.13 - tags: 7.3-alpine - when: - branch: - - master - depends_on: [ clone ] +# - name: php7.3 +# image: plugins/docker +# settings: +# username: +# from_secret: hub_username +# password: +# from_secret: hub_password +# repo: +# from_secret: hub_repo +# build_args: +# - PHP_VERSION=7.3-fpm-alpine3.13 +# tags: 7.3-alpine +# when: +# branch: +# - master +# depends_on: [ clone ] -- name: php7.2 - image: plugins/docker - settings: - username: - from_secret: hub_username - password: - from_secret: hub_password - repo: - from_secret: hub_repo - build_args: - - PHP_VERSION=7.2-fpm-alpine3.12 - tags: 7.2-alpine - when: - branch: - - master - depends_on: [ clone ] +# - name: php7.2 +# image: plugins/docker +# settings: +# username: +# from_secret: hub_username +# password: +# from_secret: hub_password +# repo: +# from_secret: hub_repo +# build_args: +# - PHP_VERSION=7.2-fpm-alpine3.12 +# tags: 7.2-alpine +# when: +# branch: +# - master +# depends_on: [ clone ] diff --git a/docker/usr/local/bin/project_setup b/docker/usr/local/bin/project_setup index d3fd10d..6848657 100755 --- a/docker/usr/local/bin/project_setup +++ b/docker/usr/local/bin/project_setup @@ -2,6 +2,8 @@ if [ -f /var/www/override.ini ]; then - rm /usr/local/etc/php/conf.d/02-project-override.ini + if [ -f /usr/local/etc/php/conf.d/02-project-override.ini ]; then + rm /usr/local/etc/php/conf.d/02-project-override.ini + fi ln -s /var/www/override.ini /usr/local/etc/php/conf.d/02-project-override.ini fi