Skip to content

Commit 82a014e

Browse files
qiaofeng1227qiaofeng1227
authored
Merge pull request #2024 from lyj-ChilDa/dev
Update akeneo
2 parents a5b274f + 1ea98c9 commit 82a014e

File tree

7 files changed

+113
-110
lines changed

7 files changed

+113
-110
lines changed

‎apps/akeneo/.env‎

Lines changed: 18 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,25 @@
1-
W9_REPO="wordpress"
1+
W9_VERSION=v7.0.22
22
W9_DIST=community
3-
W9_VERSION="latest"
4-
5-
W9_POWER_PASSWORD="1PrMxExC45LsCT"
6-
7-
# Environments which for user settings when create application
8-
# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
9-
W9_HTTP_PORT_SET=9001
10-
# W9_HTTPS_PORT_SET=9002
11-
# W9_DB_PORT_SET=3306
12-
# W9_SSH_PORT_SET=23
13-
W9_KEY_SET="dfsjdkjf77xjxcjcj"
3+
W9_REPO = websoft9dev/akeneo
4+
W9_POWER_PASSWORD=UGz0IARz117ssO%
145

156
#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
16-
17-
W9_ID=akeneo
18-
19-
# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
20-
# Some container (e.g teleport) need HTTPS access, then need to set this pra
7+
W9_ID=akeneo_z4oyc
218
W9_HTTP_PORT=80
22-
W9_HTTPS_PORT=81
23-
9+
W9_HTTP_PORT_SET=9001
2410
W9_LOGIN_USER=admin
25-
# use https://1password.com/zh-cn/password-generator/ to genarate 14 bit password
26-
# this password can also use password file
2711
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
28-
W9_ADMIN_PATH="/wp-login"
29-
30-
# Container name's suffix must use one of the value
31-
W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
32-
33-
# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
34-
# If have protocols, should be set it in the APP's ENV
35-
W9_URL=internet_ip:$W9_HTTP_PORT_SET
36-
# modifies W9_URL on init when it is true
37-
W9_URL_REPLACE=true
38-
3912
W9_NETWORK=websoft9
40-
41-
#### ----------------------------------------------------------------------------------------- ####
42-
43-
44-
# Below environment is created by this app
45-
46-
WORDPRESS_DB_HOST=$W9_ID-mariadb
47-
WORDPRESS_DB_USER=wordpress #if use postgresql, it need set to postgres
48-
WORDPRESS_DB_PASSWORD=$W9_POWER_PASSWORD
49-
WORDPRESS_DB_NAME=wordpress
50-
51-
52-
#W9_NAME=""
53-
#W9_RCODE=""
13+
W9_DB_EXPOSE="mysql"
14+
W9_MYSQL_VERSION="8.0"
15+
W9_ES_VERSION="7.10.1"
16+
W9_URL=appname.example.com
17+
#### ------------------------------------------------------------------------------------------ ####
18+
19+
AKENEO_MYSQL_DATABASE=${W9_ID}
20+
AKENEO_MYSQL_USER=${W9_ID}
21+
AKENEO_MYSQL_PASSWORD=${W9_POWER_PASSWORD}
22+
AKENEO_MYSQL_HOST=$W9_ID-mysql
23+
AKENEO_SITENAME="akeneo"
24+
AKENEO_ADMIN_USER=${W9_LOGIN_USER}
25+
AKENEO_ADMIN_PASSWORD=${W9_POWER_PASSWORD}

‎apps/akeneo/Dockerfile‎

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

‎apps/akeneo/Notes.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# Appname
2-
## FAQ
1+
# Akeneo

‎apps/akeneo/README.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Akeneo on Docker
2+
3+
This is an **Docker Compose solution** powered by [Websoft9](https://www.websoft9.com) based on Docker for Akeneo:
4+
5+
6+
- community: v7.0.22, latest
7+
8+
9+
## System Requirements
10+
11+
The following are the minimal [recommended requirements](https://github.com/akeneo/docker):
12+
13+
* **RAM**: 4 GB or more
14+
* **CPU**: 2 cores or higher
15+
* **Disk**: at least 1 GB of free space
16+
* **bandwidth**: more fluent experience over 100M
17+
18+
## Install
19+
20+
You can install this Akeneo by [How to use it?](https://github.com/Websoft9/docker-library#how-to-use-it).
21+
22+
If you want use Akeneo with **Websoft9 Business Support** free, you can [subscribe Akeneo](https://www.websoft9.com/apps) on Cloud platform
23+
24+
## Documentation
25+
26+
[Akeneo Administrator Guide](https://support.websoft9.com/docs/akeneo) powered by Websoft9

‎apps/akeneo/docker-compose.yml‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,46 @@
1-
# image,docs: https://hub.docker.com/_/wordpress/
1+
version: '3.8'
22

33
services:
4-
5-
wordpress:
6-
image: $W9_REPO:$W9_VERSION
7-
container_name: $W9_ID
8-
restart: unless-stopped
9-
#This is for access host from container
10-
# extra_hosts: ["host.docker.internal:host-gateway"]
11-
# command: |
12-
# /bin/bash -c "ping -c 3 host.docker.internal"
13-
logging:
14-
driver: "json-file"
15-
options:
16-
max-file: "5"
17-
max-size: 10m
18-
deploy:
19-
resources:
20-
limits:
21-
memory: 5g
22-
cpus: '0.7'
23-
ports:
24-
- $W9_HTTP_PORT_SET:80
4+
akeneo:
5+
image: ${W9_REPO}:${W9_VERSION}
6+
container_name: ${W9_ID}
257
env_file: .env
8+
ports:
9+
- ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
2610
volumes:
27-
- wordpress:/var/www/html
28-
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
11+
- akeneo:/var/www/html
12+
- ./src/000-default.conf:/etc/apache2/sites-available/000-default.conf
13+
restart: unless-stopped
14+
15+
mysql:
16+
image: mysql:$W9_MYSQL_VERSION
17+
container_name: $W9_ID-mysql
18+
restart: unless-stopped
19+
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
20+
volumes:
21+
- mysql:/var/lib/mysql
22+
environment:
23+
MYSQL_DATABASE: ${W9_ID}
24+
MYSQL_USER: ${W9_ID}
25+
MYSQL_PASSWORD: ${W9_POWER_PASSWORD}
26+
MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD}
2927

30-
mariadb:
31-
image: mariadb:10.4
32-
container_name: $W9_ID-mariadb
28+
elasticsearch:
29+
image: elasticsearch:$W9_ES_VERSION
30+
container_name: ${W9_ID}-elasticsearch
3331
restart: unless-stopped
34-
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
3532
volumes:
36-
- mysql_data:/var/lib/mysql
33+
- elasticsearch:/usr/share/elasticsearch/data
3734
environment:
38-
MYSQL_DATABASE: $WORDPRESS_DB_NAME
39-
MYSQL_USER: $WORDPRESS_DB_USER
40-
MYSQL_PASSWORD: $W9_POWER_PASSWORD
41-
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
35+
ES_JAVA_OPTS: '${ES_JAVA_OPTS:--Xms512m -Xmx512m}'
36+
discovery.type: 'single-node'
4237

43-
volumes:
44-
wordpress:
45-
mysql_data:
46-
4738
networks:
4839
default:
49-
name: $W9_NETWORK
40+
name: ${W9_NETWORK}
5041
external: true
42+
43+
volumes:
44+
akeneo:
45+
mysql:
46+
elasticsearch:

‎apps/akeneo/src/000-default.conf‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
<VirtualHost *:80>
3+
4+
ServerName localhost:80
5+
6+
DocumentRoot /var/www/html/public
7+
<Directory /var/www/html/public>
8+
AllowOverride None
9+
Require all granted
10+
11+
Options -MultiViews
12+
RewriteEngine On
13+
RewriteCond %{REQUEST_FILENAME} !-f
14+
RewriteRule ^(.*)$ index.php [QSA,L]
15+
</Directory>
16+
17+
<Directory /var/www/html/public/bundles>
18+
RewriteEngine Off
19+
</Directory>
20+
21+
<FilesMatch \.php$>
22+
SetHandler "proxy:unix:/run/php/php8.1-fpm.sock|fcgi://localhost/"
23+
</FilesMatch>
24+
25+
SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
26+
27+
ErrorLog /var/www/html/akeneo-pim_error.log
28+
LogLevel warn
29+
CustomLog /var/www/html/akeneo-pim_access.log combined
30+
</VirtualHost>

‎apps/akeneo/variables.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1+
12
{
23
"name": "akeneo",
34
"trademark": "Akeneo",
45
"release": false,
56
"fork_url": "https://github.com/akeneo/pim-community-dev",
6-
"version_from": "https://hub.docker.com/r/websoft9dev/akeneo/tags",
77
"edition": [
88
{
99
"dist": "community",
1010
"version": [
11+
"v7.0.22",
1112
"latest"
1213
]
1314
}
1415
],
1516
"requirements": {
1617
"cpu": "2",
1718
"memory": "4",
18-
"disk": "10",
19-
"url": "https://github.com/akeneo/docker#recommended-system-requirements"
19+
"disk": "1",
20+
"url": "https://github.com/akeneo/docker"
2021
}
2122
}

0 commit comments

Comments
 (0)