Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump joomla version from 5.1.4 to 5.2.0 #103

Merged
merged 8 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .devcontainer/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ services:
JOOMLA_DB_HOST: ${JOOMLA_DB_HOST:-mysql}
JOOMLA_DB_PASSWORD: ${JOOMLA_DB_PASSWORD:-${MYSQL_ROOT_PASSWORD:-secret}}
# https://xdebug.org/docs/all_settings
XDEBUG_CONFIG: 'client_host=localhost log=/tmp/xdebug.log'
XDEBUG_MODE: debug
# XDEBUG_CONFIG: 'client_host=localhost log=/tmp/xdebug.log'
# XDEBUG_MODE: debug
ports:
- 127.0.0.1:80:80
networks:
Expand Down Expand Up @@ -61,12 +61,12 @@ services:
source: ${LOCAL_WORKSPACE_FOLDER:-..}/.vscode
target: /var/www/html/.vscode
consistency: cached
environment:
# environment:
# https://github.com/OpenMage/magento-lts/blob/32773dd4f82bb44bac89e8eca97379dad2a10af5/app/Mage.php#L22
# MAGE_IS_DEVELOPER_MODE: '1'
# https://xdebug.org/docs/all_settings
XDEBUG_CONFIG: 'client_host=localhost log=/tmp/xdebug.log'
XDEBUG_MODE: debug
# XDEBUG_CONFIG: 'client_host=localhost log=/tmp/xdebug.log'
# XDEBUG_MODE: debug
ports:
- 127.0.0.1:8080:8080
networks:
Expand Down
20 changes: 10 additions & 10 deletions .devcontainer/joomla/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG PHP_VERSION=8.3
ARG PHP_EXTRA_BUILD_DEPS=""
# https://hub.docker.com/_/joomla
ARG JOOMLA_VERSION=5.1.4
ARG JOOMLA_VERSION=5.2.0

FROM joomla:${JOOMLA_VERSION}-apache AS joomla

Expand All @@ -11,9 +11,9 @@ FROM php:${PHP_VERSION}-apache
ENV LANG=en_US.UTF-8

# install MySQL client
RUN apt-get update \
&& apt-get install -y --no-install-recommends default-mysql-client \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && \
apt-get install -y --no-install-recommends default-mysql-client && \
apt-get clean -y && rm -rf /var/lib/apt/lists/*

# install pickle
# https://github.com/FriendsOfPHP/pickle
Expand All @@ -34,9 +34,9 @@ RUN set -eux; \
docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-install -j$(nproc) opcache \
intl gd mysqli pcntl pdo_mysql soap xsl zip; \
pickle install --no-interaction apcu; \
pickle install --no-interaction redis; \
pickle install --no-interaction xdebug; \
pickle install --no-interaction apcu-stable; \
pickle install --no-interaction redis-stable; \
pickle install --no-interaction xdebug-stable; \
docker-php-ext-enable apcu opcache redis xdebug; \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
Expand All @@ -49,7 +49,7 @@ RUN set -eux; \
| sort -u \
| xargs -r apt-mark manual; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*;
rm -rf /var/lib/apt/lists/* /tmp/*;

# set up Apache2
RUN set -eux; \
Expand Down Expand Up @@ -77,5 +77,5 @@ RUN set -eux; \
chown -R www-data:www-data /usr/src/joomla; \
chmod -R g+w /usr/src/joomla;

ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]
ENTRYPOINT [ "/entrypoint.sh" ]
CMD [ "apache2-foreground" ]
9 changes: 4 additions & 5 deletions .devcontainer/openmage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ RUN set -eux; \
docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-install -j$(nproc) opcache \
intl gd mysqli pcntl pdo_mysql soap xsl zip; \
pickle install --no-interaction apcu; \
pickle install --no-interaction redis; \
pickle install --no-interaction xdebug; \
pickle install --no-interaction apcu-stable; \
pickle install --no-interaction redis-stable; \
pickle install --no-interaction xdebug-stable; \
docker-php-ext-enable apcu opcache redis xdebug; \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
Expand All @@ -68,7 +68,7 @@ RUN set -eux; \
| sort -u \
| xargs -r apt-mark manual; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*;
rm -rf /var/lib/apt/lists/* /tmp/*;

# set up Apache2
RUN set -eux; \
Expand All @@ -84,7 +84,6 @@ RUN set -eux; \
# enable support for TLS termination
echo 'SetEnvIf X-Forwarded-Proto https HTTPS=on'; \
} >> /etc/apache2/apache2.conf;


# install composer
# https://hub.docker.com/_/composer
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/openmage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Create API Role

> System->`Web Services`->`SOAP/XML-RPC Users`->`Add New Role`
> System->`Web Services`->`SOAP/XML-RPC Roles`->`Add New Role`

- Role Name: `MageBridge`
- Resource Access: `All`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ composer run phpstan

## Installation

### Joomla!
### Joomla

> see [here](./.devcontainer/joomla/) for details

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
"type": "package",
"package": {
"name": "joomla/joomla-cms",
"version": "5.1.4",
"version": "5.2.0",
"dist": {
"url": "https://github.com/joomla/joomla-cms/releases/download/5.1.4/Joomla_5.1.4-Stable-Full_Package.zip",
"url": "https://github.com/joomla/joomla-cms/releases/download/5.2.0/Joomla_5.2.0-Stable-Full_Package.zip",
"type": "zip"
},
"source": {
"url": "https://github.com/joomla/joomla-cms.git",
"type": "git",
"reference": "tags/5.1.4"
"reference": "tags/5.2.0"
}
}
},
Expand All @@ -58,7 +58,7 @@
"require-dev": {
"akunzai/joomla-stubs": "dev-master",
"friendsofphp/php-cs-fixer": "^3.62",
"joomla/joomla-cms": "5.1.4",
"joomla/joomla-cms": "5.2.0",
"openmage/magento-lts": "^20.10",
"phpstan/phpstan": "^1.11"
},
Expand Down
Loading