Completely remove frontend from this repository

This commit is contained in:
ErickSkrauch 2019-04-06 01:04:51 +02:00
parent b20825a051
commit 07546bc7e9
4 changed files with 3 additions and 50 deletions

View File

@ -3,9 +3,6 @@
# vendor будет заполнен уже внутри контейнера # vendor будет заполнен уже внутри контейнера
vendor vendor
# Всё, что динамично на фронте
frontend/node_modules
frontend/dist
# Все временные файлы # Все временные файлы
*/runtime */runtime

3
.gitignore vendored
View File

@ -27,3 +27,6 @@ npm-debug*
# Codeception # Codeception
codeception.yml codeception.yml
*/codeception.yml */codeception.yml
# Frontend
frontend

View File

@ -51,44 +51,13 @@ test backend:
- ./docker/php/wait-for-it.sh "${DB_HOST}:3306" -s -t 0 -- "php yii migrate/up --interactive=0" - ./docker/php/wait-for-it.sh "${DB_HOST}:3306" -s -t 0 -- "php yii migrate/up --interactive=0"
- vendor/bin/codecept run - vendor/bin/codecept run
test frontend:
image: node:9.2.1-alpine
stage: test
cache:
paths:
- frontend/node_modules
before_script:
# Enable SSL support for wget
- apk add --update openssl
# https://github.com/facebook/flow/issues/3649#issuecomment-414691014
- wget -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
- wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk
- apk add glibc-2.28-r0.apk
script:
- cd frontend
- yarn run build:install
- yarn run lint
- yarn flow
- yarn test
build:production: build:production:
image: docker:18.02 image: docker:18.02
stage: build stage: build
variables:
GA_ID: "UA-45299905-3"
SENTRY_CDN: "https://088e7718236a4f91937a81fb319a93f6@sentry.ely.by/2"
before_script: before_script:
- docker login -u gitlab-ci -p $CI_BUILD_TOKEN registry.ely.by - docker login -u gitlab-ci -p $CI_BUILD_TOKEN registry.ely.by
- export VERSION="${CI_COMMIT_TAG:-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA:0:7}}" - export VERSION="${CI_COMMIT_TAG:-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA:0:7}}"
- echo "$SSH_PRIVATE_KEY" > id_rsa - echo "$SSH_PRIVATE_KEY" > id_rsa
- |
echo "
module.exports = {
version: '$VERSION',
ga: {id: '$GA_ID'},
sentryCdn: '$SENTRY_CDN',
};
" > frontend/config/env.js
- sed -i"" -e "s/{{PLACE_VERSION_HERE}}/$VERSION/g" common/config/config.php - sed -i"" -e "s/{{PLACE_VERSION_HERE}}/$VERSION/g" common/config/config.php
script: script:
- export IMAGE_NAME="$CONTAINER_IMAGE:latest" - export IMAGE_NAME="$CONTAINER_IMAGE:latest"

View File

@ -1,17 +1,3 @@
FROM node:9.11.2-alpine as frontend
WORKDIR /app
COPY ./frontend/package.json ./
COPY ./frontend/scripts ./scripts
COPY ./frontend/webpack-utils ./webpack-utils
COPY ./frontend/yarn.lock ./
RUN yarn build:install
COPY ./frontend .
RUN yarn build:quiet
FROM php:7.2.7-fpm-alpine3.7 FROM php:7.2.7-fpm-alpine3.7
# bash needed to support wait-for-it script # bash needed to support wait-for-it script
@ -71,8 +57,6 @@ COPY ./docker/php/*.ini /usr/local/etc/php/conf.d/
COPY ./docker/php/docker-entrypoint.sh /usr/local/bin/ COPY ./docker/php/docker-entrypoint.sh /usr/local/bin/
COPY ./docker/cron/* /etc/cron.d/ COPY ./docker/cron/* /etc/cron.d/
COPY --from=frontend /app/dist /var/www/html/frontend/dist
COPY ./api /var/www/html/api/ COPY ./api /var/www/html/api/
COPY ./common /var/www/html/common/ COPY ./common /var/www/html/common/
COPY ./console /var/www/html/console/ COPY ./console /var/www/html/console/