Merge pull request #12 from jobcloud/chore/PRO-2531/upgrade-alpine-ve…

…rsion

chore(PRO-2531): update alpine version

.github/CODEOWNERS

@@ -1 +1 @@
-* @jobcloud/find-and-apply-team-be @jobcloud/profile-team-be
+* @jobcloud/find-team-be @jobcloud/profile-team-be

.gitignore

@@ -2,6 +2,7 @@
 .project
 .idea
 .settings
+.env
 TODO
 *.iml
 examples/advisio*

composer.json

@@ -18,7 +18,7 @@
         {"type": "vcs", "no-api": true, "url": "git@github.com:jobcloud/zendpdf.git"}
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-iconv": "*",
         "ext-libxml": "*",
         "ext-mbstring": "*",
@@ -27,7 +27,7 @@
     },
     "require-dev": {
         "imagine/imagine": ">=0.2.0,<0.6.0",
-        "phpunit/phpunit": "^8.5.33"
+        "phpunit/phpunit": "^8.5.41"
     },
     "prefer-stable": true,
     "minimum-stability": "dev",

docker/.env.example

@@ -0,0 +1,7 @@
+COMPOSE_PROJECT_NAME=jobcloud-phppdf
+XDEBUG_REMOTE_HOST=localhost
+#XDEBUG_REMOTE_HOST=docker.for.mac.localhost
+SSH_PRIVATE_FILE=~/.ssh/id_rsa
+### Uncomment if ed25519 algorithm is used on machine
+#SSH_PRIVATE_FILE=~/.ssh/id_ed25519
+###

docker/docker-compose.dev.yml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
     php:
         container_name: jobcloud-phppdf-php
@@ -22,4 +21,4 @@ services:
             PHP_IDE_CONFIG: serverName=php
 secrets:
     ssh_host_key:
-        file: ~/.ssh/id_rsa
+        file: ${SSH_PRIVATE_FILE}

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.20
+FROM php:8.3-alpine3.21
 
 ARG USER_ID
 

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

@@ -2,6 +2,15 @@ alias cls='printf "\033c"'
 
 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\] '
 
+if ! pgrep ssh-agent > /dev/null
+then
+  eval `ssh-agent`
+  rm -f ~/.ssh/ssh_auth_sock
+  ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock
+fi
+export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
+ssh-add -l > /dev/null || ssh-add
+
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi