Skip to content

Commit 473c084

Browse files
committed
fix: cleanup
1 parent 46f836c commit 473c084

File tree

3 files changed

+48
-1
lines changed

3 files changed

+48
-1
lines changed

Dockerfile

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
ARG PHP_VERSION=8.2
2+
3+
FROM friendsofshopware/shopware-cli:latest-php-${PHP_VERSION} as creation
4+
ARG SHOPWARE_VERSION=6.6.3.0
5+
6+
RUN <<EOF
7+
set -e
8+
export COMPOSER_ALLOW_SUPERUSER=1
9+
shopware-cli project create /shop ${SHOPWARE_VERSION}
10+
shopware-cli project ci /shop
11+
EOF
12+
13+
COPY --chmod=555 <<EOF /shop/config/packages/override.yaml
14+
parameters:
15+
env(TRUSTED_PROXIES): ''
16+
17+
framework:
18+
trusted_proxies: '%env(TRUSTED_PROXIES)%'
19+
20+
shopware:
21+
auto_update:
22+
enabled: false
23+
store:
24+
frw: false
25+
EOF
26+
27+
28+
FROM ghcr.io/friendsofshopware/devcontainer:base-${PHP_VERSION}
29+
30+
COPY --from=creation --chown=www-data /shop /var/www/html
31+
32+
RUN <<EOF
33+
set -e
34+
/usr/bin/mariadbd --basedir=/usr --datadir=/var/lib/mariadb --plugin-dir=/usr/lib/mariadb/plugin --user=www-data &
35+
sleep 2
36+
37+
php bin/console system:install --create-database --force
38+
mariadb -uroot -proot shopware -e "DELETE FROM sales_channel WHERE id = 0x98432def39fc4624b33213a56b8c944d"
39+
php bin/console user:create "admin" --admin --password="shopware" -n
40+
php bin/console sales-channel:create:storefront --name=Storefront --url="http://localhost:8000"
41+
php bin/console theme:change --all Storefront
42+
mariadb -uroot -proot -e "SET GLOBAL innodb_fast_shutdown=0"
43+
mariadb -uroot -proot shopware -e "INSERT INTO system_config (id, configuration_key, configuration_value, sales_channel_id, created_at, updated_at) VALUES (0xb3ae4d7111114377af9480c4a0911111, 'core.frw.completedAt', '{\"_value\": \"2019-10-07T10:46:23+00:00\"}', NULL, '2019-10-07 10:46:23.169', NULL);"
44+
rm -rf var/cache/* /var/tmp/*
45+
php bin/console
46+
EOF

Dockerfile.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
apk add --no-cache \
1818
libstdc++ \
1919
bash \
20+
bash-completion \
2021
valkey \
2122
valkey-cli \
2223
curl \

rootfs/etc/Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
nginx: /usr/sbin/nginx
22
php-fpm: /usr/sbin/php-fpm
33
mysql: /usr/bin/mariadbd --basedir=/usr --datadir=/var/lib/mariadb --plugin-dir=/usr/lib/mariadb/plugin --user=www-data
4-
valkey: /usr/bin/valkey-server --dir /tmp/valkey.rdb
4+
valkey: /usr/bin/valkey-server --dir /tmp

0 commit comments

Comments
 (0)