Skip to content

Commit 8885820

Browse files
committed
chore(PRO-2531): update docker/composer config & codeowners
1 parent 1c5fc7e commit 8885820

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @jobcloud/find-and-apply-team-be @jobcloud/profile-team-be
1+
* @jobcloud/find-team-be @jobcloud/profile-team-be

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.project
33
.idea
44
.settings
5+
.env
56
TODO
67
*.iml
78
examples/advisio*

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{"type": "vcs", "no-api": true, "url": "git@github.com:jobcloud/zendpdf.git"}
1919
],
2020
"require": {
21-
"php": "^8.1",
21+
"php": "^8.2",
2222
"ext-iconv": "*",
2323
"ext-libxml": "*",
2424
"ext-mbstring": "*",
@@ -27,7 +27,7 @@
2727
},
2828
"require-dev": {
2929
"imagine/imagine": ">=0.2.0,<0.6.0",
30-
"phpunit/phpunit": "^8.5.33"
30+
"phpunit/phpunit": "^8.5.41"
3131
},
3232
"prefer-stable": true,
3333
"minimum-stability": "dev",

docker/.env

Lines changed: 0 additions & 3 deletions
This file was deleted.

docker/.env.example

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
COMPOSE_PROJECT_NAME=jobcloud-phppdf
2+
XDEBUG_REMOTE_HOST=localhost
3+
#XDEBUG_REMOTE_HOST=docker.for.mac.localhost
4+
SSH_PRIVATE_FILE=~/.ssh/id_rsa
5+
### Uncomment if ed25519 algorithm is used on machine
6+
#SSH_PRIVATE_FILE=~/.ssh/id_ed25519
7+
###

docker/docker-compose.dev.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.9'
21
services:
32
php:
43
container_name: jobcloud-phppdf-php
@@ -22,4 +21,4 @@ services:
2221
PHP_IDE_CONFIG: serverName=php
2322
secrets:
2423
ssh_host_key:
25-
file: ~/.ssh/id_rsa
24+
file: ${SSH_PRIVATE_FILE}

docker/php/files/user-home/.bashrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ alias cls='printf "\033c"'
22

33
export PS1='\[\e[1;32m\]\h\[\e[0m\] \[\e[1;37m\]\w\[\e[0m\] \[\e[1;32m\]\u\[\e[0m\] \[\e[1;37m\]\$\[\e[0m\] '
44

5+
if ! pgrep ssh-agent > /dev/null
6+
then
7+
eval `ssh-agent`
8+
rm -f ~/.ssh/ssh_auth_sock
9+
ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock
10+
fi
11+
export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
12+
ssh-add -l > /dev/null || ssh-add
13+
514
if [ -f ~/.bash_aliases ]; then
615
. ~/.bash_aliases
716
fi

0 commit comments

Comments
 (0)