Skip to content

Commit 2615215

Browse files
metas-jbmetas-jb
authored
Merge pull request #71 from metasfresh/gh69
release 5.173 including mobile
2 parents 8c9e9a8 + 6873786 commit 2615215

21 files changed

+239
-186
lines changed

‎app/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM metasfresh/metasfresh-app:5.172
1+
FROM metasfresh/metasfresh-app:5.173
22

33
COPY sources/configs/* /opt/metasfresh/
44
COPY sources/start_app.sh /opt/metasfresh/

‎db/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM metasfresh/metasfresh-db:5.172
1+
FROM metasfresh/metasfresh-db:5.173
22

33
RUN localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8
44
RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

‎docker-src/app/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt -y install netcat \
1212
&& apt -y autoclean
1313

1414
RUN mkdir -p /opt/metasfresh
15-
RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.172.2-377+release/metasfresh-dist-dist-5.172.2-377+release-dist.tar.gz \
15+
RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.173.2-389+release/metasfresh-dist-dist-5.173.2-389+release-dist.tar.gz \
1616
| tar -xzC /opt/metasfresh/
1717
RUN mkdir -p /opt/metasfresh/heapdump
1818

‎docker-src/webapi/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY sources/configs/local_settings.properties /root/
1515
RUN mkdir -p /opt/metasfresh-webui-api/metasfresh-webui-api \
1616
&& mkdir -p /opt/metasfresh-webui-api/log \
1717
&& mkdir -p /opt/metasfresh-webui-api/heapdump
18-
RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.172.2-377+release/metasfresh-webui-api-5.172.2-377+release.jar \
18+
RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.173.2-389+release/metasfresh-webui-api-5.173.2-389+release.jar \
1919
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
2020
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
2121

‎docker-src/webui/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN mkdir -p /opt/metasfresh-webui-frontend
1414

1515
COPY sources/dist /opt/metasfresh-webui-frontend/dist
1616
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
17+
COPY sources/configs/mobile/config.js /opt/metasfresh-webui-frontend/dist/mobile/
1718

1819
#add apache config
1920
COPY sources/configs/metasfresh_webui.conf /etc/apache2/sites-available/

‎docker-src/webui/sources/configs/metasfresh_webui.conf‎

Lines changed: 81 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,92 @@
11
<VirtualHost *:80>
2-
ProxyRequests Off
3-
DocumentRoot /opt/metasfresh-webui-frontend/dist/
4-
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
5-
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
2+
ProxyRequests Off
3+
DocumentRoot /opt/metasfresh-webui-frontend/dist/
4+
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
5+
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
66

7-
<Location /rest>
8-
Order allow,deny
9-
Allow from all
10-
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
11-
ProxyPassReverse http://webapi:8080/rest/
12-
</Location>
7+
<Location /rest>
8+
Order allow,deny
9+
Allow from all
10+
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
11+
ProxyPassReverse http://webapi:8080/rest/
12+
</Location>
1313

14-
<Location /stomp>
15-
Order allow,deny
16-
Allow from all
17-
RewriteEngine on
18-
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
19-
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
20-
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
21-
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
22-
ProxyPassReverse ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
23-
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
24-
ProxyPassReverse http://webapi:8080/stomp/
25-
</Location>
14+
<Location /stomp>
15+
Order allow,deny
16+
Allow from all
17+
RewriteEngine on
18+
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
19+
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
20+
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
21+
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
22+
ProxyPassReverse ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
23+
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
24+
ProxyPassReverse http://webapi:8080/stomp/
25+
</Location>
2626

27-
<Location /info>
28-
Order allow,deny
29-
Allow from all
30-
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
31-
ProxyPassReverse http://webapi:8080/info
32-
</Location>
33-
34-
<Location /swagger-ui.html>
35-
Order allow,deny
36-
Allow from all
37-
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
38-
ProxyPassReverse http://webapi:8080/swagger-ui.html
39-
</Location>
27+
<Location /info>
28+
Order allow,deny
29+
Allow from all
30+
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
31+
ProxyPassReverse http://webapi:8080/info
32+
</Location>
4033

41-
<Location /v2/api-docs>
42-
Order allow,deny
43-
Allow from all
44-
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
45-
ProxyPassReverse http://webapi:8080/v2/api-docs/
46-
</Location>
34+
<Location /swagger-ui.html>
35+
Order allow,deny
36+
Allow from all
37+
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
38+
ProxyPassReverse http://webapi:8080/swagger-ui.html
39+
</Location>
4740

48-
<Location /swagger-resources>
49-
Order allow,deny
50-
Allow from all
51-
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
52-
ProxyPassReverse http://webapi:8080/swagger-resources/
53-
</Location>
41+
<Location /v2/api-docs>
42+
Order allow,deny
43+
Allow from all
44+
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
45+
ProxyPassReverse http://webapi:8080/v2/api-docs/
46+
</Location>
5447

55-
<Location /webjars/springfox-swagger-ui>
56-
Order allow,deny
57-
Allow from all
58-
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
59-
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
60-
</Location>
48+
<Location /swagger-resources>
49+
Order allow,deny
50+
Allow from all
51+
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
52+
ProxyPassReverse http://webapi:8080/swagger-resources/
53+
</Location>
6154

62-
<Location /configuration>
63-
Order allow,deny
64-
Allow from all
65-
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
66-
ProxyPassReverse http://webapi:8080/configuration/
67-
</Location>
55+
<Location /webjars/springfox-swagger-ui>
56+
Order allow,deny
57+
Allow from all
58+
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
59+
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
60+
</Location>
6861

69-
<Location /info>
70-
Order allow,deny
71-
Allow from all
72-
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
73-
ProxyPassReverse http://webapi:8080/info
74-
</Location>
62+
<Location /configuration>
63+
Order allow,deny
64+
Allow from all
65+
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
66+
ProxyPassReverse http://webapi:8080/configuration/
67+
</Location>
7568

76-
<Directory /opt/metasfresh-webui-frontend/dist/>
77-
Options Indexes FollowSymLinks
78-
AllowOverride All
79-
Require all granted
80-
RewriteEngine On
81-
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
82-
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
83-
RewriteRule ^ - [L]
84-
RewriteRule ^ /index.html
85-
</Directory>
69+
<Location /info>
70+
Order allow,deny
71+
Allow from all
72+
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
73+
ProxyPassReverse http://webapi:8080/info
74+
</Location>
75+
76+
<Location /mobile>
77+
Order allow,deny
78+
Allow from all
79+
</Location>
80+
81+
<Directory /opt/metasfresh-webui-frontend/dist/>
82+
Options Indexes FollowSymLinks
83+
AllowOverride All
84+
Require all granted
85+
RewriteEngine On
86+
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
87+
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
88+
RewriteCond %{REQUEST_URI} !^/mobile?$
89+
RewriteRule ^ - [L]
90+
RewriteRule ^ /index.html
91+
</Directory>
8692
</VirtualHost>

‎docker-src/webui/sources/configs/metasfresh_webui_ssl.conf‎

Lines changed: 102 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,112 @@
11
<IfModule mod_ssl.c>
22
<VirtualHost *:443>
3-
ProxyRequests Off
4-
DocumentRoot /opt/metasfresh-webui-frontend/dist/
5-
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
6-
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
7-
<Location /rest>
8-
Order allow,deny
9-
Allow from all
10-
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
11-
ProxyPassReverse http://webapi:8080/rest/
12-
</Location>
13-
14-
<Location /stomp>
15-
Order allow,deny
16-
Allow from all
17-
RewriteEngine on
18-
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
19-
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
20-
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
21-
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
22-
ProxyPassReverse ws://webapi:8080/stomp/
23-
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
24-
ProxyPassReverse http://webapi:8080/stomp/
25-
</Location>
26-
27-
<Location /info>
28-
Order allow,deny
29-
Allow from all
30-
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
31-
ProxyPassReverse http://webapi:8080/info
32-
</Location>
3+
ProxyRequests Off
4+
DocumentRoot /opt/metasfresh-webui-frontend/dist/
5+
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
6+
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
7+
8+
9+
<Location /rest>
10+
Order allow,deny
11+
Allow from all
12+
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
13+
ProxyPassReverse http://webapi:8080/rest/
14+
</Location>
3315

34-
<Location /swagger-ui.html>
35-
Order allow,deny
36-
Allow from all
37-
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
38-
ProxyPassReverse http://webapi:8080/swagger-ui.html
39-
</Location>
16+
<Location /stomp>
17+
Order allow,deny
18+
Allow from all
19+
RewriteEngine on
20+
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
21+
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
22+
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
23+
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
24+
ProxyPassReverse ws://webapi:8080/stomp/
25+
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
26+
ProxyPassReverse http://webapi:8080/stomp/
27+
</Location>
28+
29+
<Location /info>
30+
Order allow,deny
31+
Allow from all
32+
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
33+
ProxyPassReverse http://webapi:8080/info
34+
</Location>
35+
36+
<Location /swagger-ui.html>
37+
Order allow,deny
38+
Allow from all
39+
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
40+
ProxyPassReverse http://webapi:8080/swagger-ui.html
41+
</Location>
42+
43+
<Location /v2/api-docs>
44+
Order allow,deny
45+
Allow from all
46+
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
47+
ProxyPassReverse http://webapi:8080/v2/api-docs/
48+
</Location>
49+
50+
<Location /swagger-resources>
51+
Order allow,deny
52+
Allow from all
53+
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
54+
ProxyPassReverse http://webapi:8080/swagger-resources/
55+
</Location>
56+
57+
<Location /webjars/springfox-swagger-ui>
58+
Order allow,deny
59+
Allow from all
60+
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
61+
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
62+
</Location>
63+
64+
<Location /configuration>
65+
Order allow,deny
66+
Allow from all
67+
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
68+
ProxyPassReverse http://webapi:8080/configuration/
69+
</Location>
4070

41-
<Location /v2/api-docs>
42-
Order allow,deny
43-
Allow from all
44-
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
45-
ProxyPassReverse http://webapi:8080/v2/api-docs/
46-
</Location>
71+
<Location /mobile>
72+
Order allow,deny
73+
Allow from all
74+
FileETag None
75+
Header unset ETag
76+
Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
77+
Header set Pragma "no-cache"
78+
Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
79+
</Location>
4780

48-
<Location /swagger-resources>
49-
Order allow,deny
50-
Allow from all
51-
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
52-
ProxyPassReverse http://webapi:8080/swagger-resources/
53-
</Location>
81+
<Directory /opt/metasfresh-webui-frontend/dist/>
82+
Options Indexes FollowSymLinks
83+
AllowOverride All
84+
Require all granted
85+
RewriteEngine On
86+
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
87+
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
88+
RewriteCond %{REQUEST_URI} !^/mobile?$
89+
RewriteRule ^ - [L]
90+
RewriteRule ^ /index.html
91+
</Directory>
5492

55-
<Location /webjars/springfox-swagger-ui>
56-
Order allow,deny
57-
Allow from all
58-
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
59-
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
60-
</Location>
93+
<Files index.html>
94+
FileETag None
95+
Header unset ETag
96+
Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
97+
Header set Pragma "no-cache"
98+
Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
99+
</Files>
61100

62-
<Location /configuration>
63-
Order allow,deny
64-
Allow from all
65-
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
66-
ProxyPassReverse http://webapi:8080/configuration/
67-
</Location>
101+
<Files service-worker.js>
102+
FileETag None
103+
Header unset ETag
104+
Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
105+
Header set Pragma "no-cache"
106+
Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
107+
</Files>
68108

69-
<Directory /opt/metasfresh-webui-frontend/dist/>
70-
Options Indexes FollowSymLinks
71-
AllowOverride All
72-
Require all granted
73-
RewriteEngine On
74-
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
75-
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
76-
RewriteRule ^ - [L]
77-
RewriteRule ^ /index.html
78-
</Directory>
79-
SSLCertificateFile /etc/apache2/certs/fullchain.pem
80-
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
109+
SSLCertificateFile /etc/apache2/certs/fullchain.pem
110+
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
81111
</VirtualHost>
82112
</IfModule>

‎docker-src/webui/sources/configs/mobile/config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const config = {
2+
SERVER_URL: 'http://MYDOCKERHOST:PORT/app',
3+
};

‎docker-src/webui/sources/dist/COMMITHASH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8ab1d7558e398335a7e5977d571767ce0226f75b
1+
e05fb14f424a57e00beb2ccf2b96992cf35afff2

0 commit comments

Comments
 (0)