Skip to content

Commit

Permalink
PHP 8.3 realted changes (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
shoxy authored Jan 29, 2024
1 parent a0f2d12 commit 996ddd1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ COMPOSE_PROJECT_NAME=gvv
### PHP Version ###########################################

# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
# Accepted values: 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=8.0
# Accepted values: 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=8.3

### Phalcon Version ###########################################

Expand Down Expand Up @@ -222,7 +222,7 @@ WORKSPACE_VITE_PORT=5173
WORKSPACE_INSTALL_JDK=true

### PHP_FPM ###############################################
PHP_FPM_BASE_IMAGE_TAG_PREFIX="20210814" # https://github.com/laradock/laradock/issues/3042#issuecomment-920982566
PHP_FPM_BASE_IMAGE_TAG_PREFIX=latest
PHP_FPM_INSTALL_BCMATH=true
PHP_FPM_INSTALL_MYSQLI=true
PHP_FPM_INSTALL_INTL=true
Expand Down
11 changes: 2 additions & 9 deletions php-worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#

ARG LARADOCK_PHP_VERSION
# 3.13 because otherwise getting #8 9.687 make: *** [Makefile:192: mysqli.lo] Error 127
# 3.19 because otherwise getting #8 9.687 make: *** [Makefile:192: mysqli.lo] Error 127
# https://github.com/docker-library/php/issues/1130#issuecomment-782831134
FROM php:${LARADOCK_PHP_VERSION}-alpine3.13
FROM php:${LARADOCK_PHP_VERSION}-alpine3.19
LABEL maintainer="Mahmoud Zalt <[email protected]>"

ARG LARADOCK_PHP_VERSION
Expand Down Expand Up @@ -580,13 +580,6 @@ RUN set -xe; \
&& docker-php-ext-enable ssdb \
;fi

# Install iconv
RUN docker-php-ext-install iconv
# Fix iconv(): Wrong charset, conversion from `UTF-8' to `ASCII//TRANSLIT' is not allowed
# https://github.com/DH-Enterprise/orion-bridge/commit/c123e509f9feb2c5473ecab665bc71570ac86e66#diff-a023c128fb1812aec6a748219fd0dab49cf85b3c48115da62b97299098c6a7f7R265
RUN apk add --no-cache gnu-libiconv
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

###########################################################################
# Intl:
###########################################################################
Expand Down

0 comments on commit 996ddd1

Please sign in to comment.