Обновил сборку и зависимости
This commit is contained in:
parent
91cfa35d2c
commit
7007b184d0
@ -30,7 +30,7 @@ jobs:
|
|||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: /tmp/workspace
|
at: /tmp/workspace
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker/provision.sh
|
- run: docker/php/provision.sh
|
||||||
- run: composer install --no-interaction --no-progress
|
- run: composer install --no-interaction --no-progress
|
||||||
- run: mkdir -p ${STATIC_DIR}
|
- run: mkdir -p ${STATIC_DIR}
|
||||||
- run: cp -R /tmp/workspace/static/* ${STATIC_DIR}
|
- run: cp -R /tmp/workspace/static/* ${STATIC_DIR}
|
||||||
@ -55,7 +55,7 @@ jobs:
|
|||||||
- add_ssh_keys
|
- add_ssh_keys
|
||||||
- run: apt-get update; apt-get install -yy openssh-client
|
- run: apt-get update; apt-get install -yy openssh-client
|
||||||
- run: ssh-keyscan "vakhrushev.me" >> ~/.ssh/known_hosts
|
- run: ssh-keyscan "vakhrushev.me" >> ~/.ssh/known_hosts
|
||||||
- run: docker/provision.sh
|
- run: docker/php/provision.sh
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: /tmp/workspace
|
at: /tmp/workspace
|
||||||
- run: mkdir -p ./output_prod
|
- run: mkdir -p ./output_prod
|
||||||
|
2
.env
2
.env
@ -1,2 +1,2 @@
|
|||||||
PHP_IMAGE=homepage-php
|
PHP_IMAGE=homepage-php
|
||||||
NODE_IMAGE=node:12-alpine
|
NODE_IMAGE=homepage-node
|
||||||
|
906
composer.lock
generated
906
composer.lock
generated
File diff suppressed because it is too large
Load Diff
3
docker/node/Dockerfile
Normal file
3
docker/node/Dockerfile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
FROM node:12.22.3-alpine
|
||||||
|
|
||||||
|
RUN npm install -g npm
|
@ -1,4 +1,4 @@
|
|||||||
FROM php:7.4.12-cli
|
FROM php:7.4.21-cli
|
||||||
|
|
||||||
COPY ./docker/provision.sh /opt/
|
COPY ./docker/provision.sh /opt/
|
||||||
|
|
12137
npm-shrinkwrap.json
generated
12137
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
26
package.json
26
package.json
@ -6,27 +6,27 @@
|
|||||||
"description": "Homepage",
|
"description": "Homepage",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@anwinged/predictor": "^0.2.1",
|
"@anwinged/predictor": "^0.2.1",
|
||||||
"@babel/core": "^7.12.3",
|
"@babel/core": "^7.14.6",
|
||||||
"@babel/plugin-proposal-class-properties": "^7.12.1",
|
"@babel/plugin-proposal-class-properties": "^7.14.5",
|
||||||
"@babel/plugin-transform-runtime": "^7.12.1",
|
"@babel/plugin-transform-runtime": "^7.14.5",
|
||||||
"@babel/preset-env": "^7.12.1",
|
"@babel/preset-env": "^7.14.7",
|
||||||
"@babel/runtime": "^7.12.5",
|
"@babel/runtime": "^7.14.6",
|
||||||
"autoprefixer": "^9.8.6",
|
"autoprefixer": "^9.8.6",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.2.2",
|
||||||
"css-loader": "^2.1.1",
|
"css-loader": "^2.1.1",
|
||||||
"glob": "^7.1.6",
|
"glob": "^7.1.7",
|
||||||
"mini-css-extract-plugin": "^0.6.0",
|
"mini-css-extract-plugin": "^0.6.0",
|
||||||
"node-sass": "^4.14.1",
|
"node-sass": "^4.14.1",
|
||||||
"postcss-loader": "^3.0.0",
|
"postcss-loader": "^3.0.0",
|
||||||
"prettier": "^1.19.1",
|
"prettier": "^1.19.1",
|
||||||
"sass-loader": "^7.3.1",
|
"sass-loader": "^7.3.1",
|
||||||
"style-loader": "^0.23.1",
|
"style-loader": "^0.23.1",
|
||||||
"underscore": "^1.11.0",
|
"underscore": "^1.13.1",
|
||||||
"vue": "^2.6.12",
|
"vue": "^2.6.14",
|
||||||
"vue-loader": "^15.9.5",
|
"vue-loader": "^15.9.7",
|
||||||
"vue-style-loader": "^4.1.2",
|
"vue-style-loader": "^4.1.3",
|
||||||
"vue-template-compiler": "^2.6.12",
|
"vue-template-compiler": "^2.6.14",
|
||||||
"webpack": "^4.44.2",
|
"webpack": "^4.46.0",
|
||||||
"webpack-cli": "^3.3.12"
|
"webpack-cli": "^3.3.12"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@ -3,6 +3,11 @@
|
|||||||
source .env
|
source .env
|
||||||
|
|
||||||
docker build \
|
docker build \
|
||||||
--file docker/Dockerfile \
|
--file docker/php/Dockerfile \
|
||||||
--tag "${PHP_IMAGE}" \
|
--tag "${PHP_IMAGE}" \
|
||||||
"$PWD"
|
"$PWD"
|
||||||
|
|
||||||
|
docker build \
|
||||||
|
--file docker/node/Dockerfile \
|
||||||
|
--tag "${NODE_IMAGE}" \
|
||||||
|
"$PWD"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user