Skip to content

Commit 0bb8e85

Browse files
authored
Upgrade angular 9 (#31)
* Upgraded frontend and api * Upgraded backend * Fixed tests
1 parent 7f3a6d2 commit 0bb8e85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+13540
-9394
lines changed

README.md

Lines changed: 186 additions & 150 deletions
Large diffs are not rendered by default.

api/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM php:7.3.9-apache-stretch
2-
1+
FROM php:7.4.3-apache
32

43
RUN requirements="nano cron mariadb-client libwebp-dev libxpm-dev libmcrypt-dev libmcrypt4 libcurl3-dev libxml2-dev \
54
libmemcached-dev zlib1g-dev libc6 libstdc++6 libkrb5-3 openssl debconf libfreetype6-dev libjpeg-dev libtiff-dev \
6-
libpng-dev git imagemagick libmagickwand-dev ghostscript gsfonts libbz2-dev libzip-dev zip unzip" \
5+
libpng-dev git imagemagick libmagickwand-dev ghostscript gsfonts libbz2-dev libonig-dev libzip-dev zip unzip" \
76
&& apt-get update && apt-get install -y --no-install-recommends $requirements && apt-get clean && rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-install mysqli \
98
pdo_mysql \
@@ -21,7 +20,7 @@ libpng-dev git imagemagick libmagickwand-dev ghostscript gsfonts libbz2-dev libz
2120
xdebug \
2221
imagick \
2322
apcu \
24-
opcache
23+
opcache
2524

2625
# Configure version constraints
2726
ENV VERSION_COMPOSER_ASSET_PLUGIN=^1.4.2 \
@@ -56,7 +55,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
5655
composer global dumpautoload --optimize && \
5756
composer clear-cache
5857

59-
6058
WORKDIR /srv
6159

6260
COPY composer.* /srv/
@@ -65,9 +63,11 @@ ENV PATH /srv/vendor/bin:${PATH}
6563

6664
COPY . /srv/
6765

68-
RUN chown -R www-data:www-data /srv/ \
69-
&& mkdir /srv/runtime \
70-
&& chmod 777 -R /srv/runtime
66+
RUN mkdir /srv/runtime \
67+
&& chmod 777 -R /srv/runtime \
68+
&& mkdir /srv/web/assets \
69+
&& chmod 777 -R /srv/web/assets \
70+
&& chown -R www-data:www-data /srv/
7171

7272
EXPOSE 80
7373

api/composer.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "chrisleek/yii2-anguar-boilerplate",
3-
"description": "Yii 2 Rest API",
2+
"name": "chrisleekr/yii2-angular-boilerplate",
3+
"description": "Yii 2 REST API",
44
"keywords": [
55
"yii2",
66
"boilerplate"
@@ -36,14 +36,7 @@
3636
"config": {
3737
"process-timeout": 1800,
3838
"fxp-asset": {
39-
"installer-paths": {
40-
"npm-asset-library": "vendor/npm",
41-
"bower-asset-library": "vendor/bower"
42-
},
43-
"vcs-driver-options": {
44-
"github-no-api": true
45-
},
46-
"pattern-skip-version": "(-build|-patch)"
39+
"enabled": false
4740
}
4841
},
4942
"scripts": {

0 commit comments

Comments
 (0)