spt/Website
spt/Website
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge development into master #28

Merged
Ghost merged 12 commits from development into master 2021-12-02 10:55:41 -05:00
Conversation 0 Commits 12 Files Changed 7 +6 -4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d7b814700 - Show all commits

8
.drone-docker.yml
View File

@ -40,7 +40,7 @@ steps:
- yarn --cwd ./items/frontend install - yarn --cwd ./items/frontend install
- yarn --cwd ./items/frontend build --pure-lockfile - yarn --cwd ./items/frontend build --pure-lockfile
- rm -rf ./items/api/public/static/* - rm -rf ./items/api/public/static/*
- cp ./items/frontend/build/* ./items/api/public - cp -r ./items/frontend/build/* ./items/api/public
- rm ./items/api/public/index.html - rm ./items/api/public/index.html
depends_on: depends_on:
- replace hosts and user variables - replace hosts and user variables
@ -48,7 +48,9 @@ steps:
- name: frontend - name: frontend
image: nginx:1.21.4-alpine image: nginx:1.21.4-alpine
commands: commands:
- cp ./items/frontend/build/* /usr/share/nginx/html - cp -r ./items/frontend/build/* /usr/share/nginx/html
- cp ./items/frontend/src/cypress/nginx_config/default.conf /etc/nginx/conf.d/default.conf
- nginx -g "daemon off;"
detach: true detach: true
depends_on: depends_on:
- install dependencies and build frontend - install dependencies and build frontend
@ -59,7 +61,7 @@ steps:
- node -v - node -v
- npm -v - npm -v
- yarn --version - yarn --version
- yarn --cwd ./items/frontend cy:run - yarn --cwd ./items/frontend cy:ci
depends_on: depends_on:
- install dependencies and build frontend - install dependencies and build frontend

2
.drone-kubernetes.yml
View File

@ -49,7 +49,7 @@ steps:
image: nginx:1.21.4-alpine image: nginx:1.21.4-alpine
commands: commands:
- cp -r ./items/frontend/build/* /usr/share/nginx/html - cp -r ./items/frontend/build/* /usr/share/nginx/html
- cp ./items/frontend/src/cypress/fixtures/default.conf /etc/nginx/conf.d/default.conf - cp ./items/frontend/src/cypress/nginx_config/default.conf /etc/nginx/conf.d/default.conf
- nginx -g "daemon off;" - nginx -g "daemon off;"
detach: true detach: true
depends_on: depends_on:

0
items/frontend/src/cypress/fixtures/default.conf → items/frontend/src/cypress/nginx_config/default.conf
View File