Skip to content

Commit

Permalink
Show file tree
Hide file tree
Showing 97 changed files with 1,155 additions and 1,040 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/Build export-ignore
.gitkeep export-ignore
/.editorconfig export-ignore
/.env export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.phpstorm.meta.php export-ignore
Expand All @@ -16,6 +17,9 @@
/Tests export-ignore
/Makefile export-ignore
/phive.xml export-ignore
/phpunit.browser.xml export-ignore
/phpunit.functional.xml export-ignore
/phpunit.unit.xml export-ignore

/Tests/Browser/files/* filter=lfs diff=lfs merge=lfs -text
/Tests/Manual/images/* filter=lfs diff=lfs merge=lfs -text
Expand Down
26 changes: 0 additions & 26 deletions .project/data/dumps/local/tx_in2publish_workflow_history.csv

This file was deleted.

77 changes: 0 additions & 77 deletions .project/data/dumps/local/tx_in2publish_workflow_state.csv

This file was deleted.

4 changes: 0 additions & 4 deletions .project/docker/docker-compose.ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
local:
image: in2code/httpd:2.4-alpine
Expand All @@ -21,7 +19,6 @@ services:
build:
context: .project/docker/local-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down Expand Up @@ -61,7 +58,6 @@ services:
build:
context: .project/docker/foreign-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down
4 changes: 0 additions & 4 deletions .project/docker/docker-compose.darwin.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
local:
image: in2code/httpd:2.4-alpine
Expand All @@ -24,7 +22,6 @@ services:
build:
context: .project/docker/local-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down Expand Up @@ -67,7 +64,6 @@ services:
build:
context: .project/docker/foreign-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down
4 changes: 0 additions & 4 deletions .project/docker/docker-compose.linux.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
local:
image: in2code/httpd:2.4-alpine
Expand All @@ -24,7 +22,6 @@ services:
build:
context: .project/docker/local-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down Expand Up @@ -69,7 +66,6 @@ services:
build:
context: .project/docker/foreign-php
dockerfile: Dockerfile
target: base
args:
USER_ID: ${USER_ID:-1000}
GROUP_ID: ${GROUP_ID:-1000}
Expand Down
9 changes: 2 additions & 7 deletions .project/docker/foreign-php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM in2code/php-dev:8.1-fpm AS base
FROM in2code/php-dev:8.1-fpm

ARG USER_ID=1000
ARG GROUP_ID=1000
Expand All @@ -21,13 +21,8 @@ RUN chmod 600 /home/app/.ssh/authorized_keys \
&& apt-get autoremove -y \
&& apt-get clean \
&& echo "php_admin_value[memory_limit] = 256M" >> /usr/local/etc/php-fpm.d/www.conf \
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini \
&& echo "xdebug.mode=off" > /usr/local/etc/php/conf.d/zz_xdebug.ini
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini

COPY docker-php-entrypoint /usr/local/bin/docker-php-entrypoint

EXPOSE 22

FROM base AS local

COPY xdebug.ini /usr/local/etc/php/conf.d/zz_xdebug.ini
3 changes: 0 additions & 3 deletions .project/docker/foreign-php/xdebug.ini

This file was deleted.

9 changes: 2 additions & 7 deletions .project/docker/local-php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM in2code/php-dev:8.1-fpm AS base
FROM in2code/php-dev:8.1-fpm

ARG USER_ID=1000
ARG GROUP_ID=1000
Expand All @@ -23,11 +23,6 @@ RUN apt-get update \
&& apt-get autoremove -y \
&& apt-get clean \
&& echo "php_admin_value[memory_limit] = 256M" >> /usr/local/etc/php-fpm.d/www.conf \
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini \
&& echo "xdebug.mode=off" > /usr/local/etc/php/conf.d/zz_xdebug.ini
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini

USER $USER_ID:$GROUP_ID

FROM base AS local

COPY xdebug.ini /usr/local/etc/php/conf.d/zz_xdebug.ini
4 changes: 0 additions & 4 deletions .project/docker/local-php/xdebug.ini

This file was deleted.

2 changes: 1 addition & 1 deletion .project/githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DIFF=$(git -c diff.mnemonicprefix=false -c diff.noprefix=false --no-pager diff -
-v $PWD:$PWD \
-w $PWD \
-e GRUMPHP_GIT_WORKING_DIR="$(git rev-parse --show-toplevel)" \
in2code/php:7.4-fpm \
in2code/php:8.1-fpm \
'.project/phars/grumphp' \
'git:pre-commit' \
'--skip-success-output' \
Expand Down
Loading

0 comments on commit 06ba6e3

Please sign in to comment.