zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
235 Commits 1 Branch 0 Tags
69102f4af97f12e91ec0c30f2189f596fdf4f620
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Zeisler 69102f4af9 Merge remote-tracking branch 'origin/master' 2021-05-12 00:33:05 +02:00
Marco Zeisler 723b817eef Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.gitlab-ci.yml
#	frontend/karma.conf.js
 2021-05-12 00:31:16 +02:00
Marco Zeisler f6315dc393 revert and update gitlab-ci.yml file 2021-05-12 00:30:48 +02:00
Marco Zeisler d18e754f3b remove smoke test, it is not necessary 
(cherry picked from commit 5975967229)
 2021-05-12 00:28:44 +02:00
Marco Zeisler 3fa0a9b51b added one smoke test which always succeeds (for ci config). 
(cherry picked from commit e80f2a9182)
 2021-05-12 00:28:37 +02:00
Marco Zeisler e030de2104 only use chrome headless 
(cherry picked from commit 83300d91d0)
 2021-05-12 00:28:26 +02:00
Marco Zeisler 5b8b0c539f fix test runner 
(cherry picked from commit 5b100f6e15)
 2021-05-12 00:27:59 +02:00
Marco Zeisler 46b187ca95 added ci info [skip ci] 
(cherry picked from commit 9779d9f463)
 2021-05-12 00:27:39 +02:00
Marco Zeisler 3bd1bfd5e7 build backend in CI 
use this build package in docker-compose;

(cherry picked from commit 1d1dd227fa)
 2021-05-12 00:27:21 +02:00
Marco Zeisler cc5f4d3e1c update 
(cherry picked from commit d04930fd8e)
 2021-05-12 00:27:04 +02:00
Marco Zeisler 5022155c1a fix linter errors; 
(cherry picked from commit 9a81845da8)
 2021-05-12 00:26:53 +02:00
Marco Zeisler 97975fc108 init 
(cherry picked from commit 601384d363)
 2021-05-12 00:26:24 +02:00
Marco Zeisler 7768d96eb8 update to assignment 3 
(cherry picked from commit 91d6020e10)
 2021-05-12 00:25:56 +02:00
Marco Zeisler 34154c4cf0 perform only when package-lock.json changes 2021-05-12 00:09:47 +02:00
Marco Zeisler 5af6c35b24 fix nodemodules build; 2021-05-11 23:57:56 +02:00
Marco Zeisler 5a6f5deb59 added npm install 2021-05-11 23:53:43 +02:00
Marco Zeisler 9d4e27bac7 fix commands 2021-05-11 23:42:22 +02:00
Marco Zeisler e5d4221a0a pull cache 2021-05-11 23:40:18 +02:00
Marco Zeisler 78283347b3 Merge remote-tracking branch 'origin/master' 2021-05-11 23:29:14 +02:00
Marco Zeisler 5b0eb4c55b remove only 2021-05-11 23:28:54 +02:00
Marco Zeisler 1ccefb34fc update image 2021-05-11 23:03:23 +02:00
Marco Zeisler 0e35fc6441 Merge remote-tracking branch 'origin/master' 2021-05-11 23:00:17 +02:00
Marco Zeisler f55abe9e6d Merge remote-tracking branch 'origin/master' 2021-05-11 23:00:01 +02:00
Marco Zeisler c370aed900 use node:alpine, but cache node modules [skip-ci] 2021-05-11 22:59:53 +02:00
Marco Zeisler 1c1b8823df Revert "prevent unnecessary re-compiling;" 
This reverts commit 5dc4c37a
 2021-05-11 22:57:41 +02:00
Marco Zeisler c23ae43f76 update 2021-05-11 22:57:06 +02:00
Marco Zeisler 8ef9456478 Merge remote-tracking branch 'origin/master' 2021-05-11 22:04:35 +02:00
Marco Zeisler 85e272e923 remove install puppeteer 2021-05-11 22:03:24 +02:00
Marco Zeisler d7c3e020a7 remove karma-phantomjs-launcher 2021-05-11 21:52:11 +02:00
Marco Zeisler b1692e4e45 fix headless chrome 2021-05-11 21:48:28 +02:00
Marco Zeisler a5f1cc5eff fix / added puppeteer for chrome headless 2021-05-11 21:17:58 +02:00
Marco Zeisler c621dddb74 use node:alpine to properly build image with precompiled binaries; 2021-05-11 21:08:12 +02:00
Marco Zeisler 4852848baa add export CHROME_BIN='/usr/bin/chromium' 2021-05-11 21:02:53 +02:00
Marco Zeisler fcccc82a41 fix docker push 2021-05-11 20:51:58 +02:00
Marco Zeisler 2ac9e387fb Merge remote-tracking branch 'origin/master' 2021-05-11 20:43:11 +02:00
Marco Zeisler 094c0001c2 remove artifacts:untracked from lint job 2021-05-11 20:42:46 +02:00
Marco Zeisler 5dc4c37a14 prevent unnecessary re-compiling; 2021-05-11 20:38:34 +02:00
Marco Zeisler 5975967229 remove smoke test, it is not necessary 2021-05-11 20:23:59 +02:00
Marco Zeisler 0a55437743 Merge remote-tracking branch 'origin/master' 2021-05-11 20:21:27 +02:00
Marco Zeisler 47d9deb011 docker-build cannt execute docker-compose; 2021-05-11 20:20:31 +02:00
Marco Zeisler e80f2a9182 added one smoke test which always succeeds (for ci config). 2021-05-11 20:18:31 +02:00
Marco Zeisler 83300d91d0 only use chrome headless 2021-05-11 20:12:34 +02:00
Marco Zeisler 5b100f6e15 fix test runner 2021-05-11 20:11:07 +02:00
Marco Zeisler 3ec3516865 Merge remote-tracking branch 'origin/master' 2021-05-11 20:03:45 +02:00
Marco Zeisler 581e6d5a20 added missing karma-htmlfile-reporter 2021-05-11 20:03:24 +02:00
Marco Zeisler 5320763ca4 try another docker image 2021-05-11 19:59:32 +02:00
Marco Zeisler 9779d9f463 added ci info [skip ci] 2021-05-11 19:52:55 +02:00
Marco Zeisler 86db2e63f7 --password-stdin does not work 2021-05-11 19:49:50 +02:00
Marco Zeisler bb5f40c93a use npm update instead of npm install 2021-05-11 19:48:38 +02:00
Marco Zeisler 6d80cf94e3 retry 2021-05-11 19:46:14 +02:00
Marco Zeisler 7866f4152f use image containing docker binaries 2021-05-11 19:35:59 +02:00
Marco Zeisler a2bac88db1 use image containing docker binaries 2021-05-11 19:35:16 +02:00
Marco Zeisler d094ab5cd8 fix path 2021-05-11 19:32:31 +02:00
Marco Zeisler ea202da8a3 use docker tagged runner 2021-05-11 19:31:46 +02:00
Marco Zeisler 4039e1704b Merge remote-tracking branch 'origin/master' 2021-05-11 19:25:33 +02:00
Marco Zeisler ab2f137b32 swtich back to docker-compose but split up the different images; 2021-05-11 19:19:36 +02:00
Marco Zeisler 41aab51c7b swtich back to docker-compose 2021-05-11 19:17:36 +02:00
Marco Zeisler b278967417 swtich to docker build 2021-05-11 19:08:50 +02:00
Marco Zeisler 085e9e6e26 speedup process with an image which has angular cli installed 2021-05-11 18:42:33 +02:00
Marco Zeisler 1d1dd227fa build backend in CI 
use this build package in docker-compose;
 2021-05-11 18:41:14 +02:00
Marco Zeisler d04930fd8e update 2021-05-11 18:07:01 +02:00
Marco Zeisler 9a81845da8 fix linter errors; 2021-05-11 17:57:30 +02:00
Marco Zeisler fc38c747aa check if install also works and is faster than update 2021-05-11 17:54:39 +02:00
Marco Zeisler 8cd4f8281f added update 2021-05-11 17:50:57 +02:00
Marco Zeisler 66e2b7fe84 show if artifacts are there 2021-05-11 17:47:21 +02:00
Marco Zeisler 870912b530 use another image 2021-05-11 17:46:55 +02:00
Marco Zeisler 5df09e4e76 fix path; 2021-05-11 17:45:09 +02:00
Marco Zeisler 0d1d462b65 fix paths 2021-05-11 17:40:32 +02:00
Marco Zeisler bfb291836b build_be 
lint_fe
 2021-05-11 17:37:25 +02:00
Marco Zeisler 6f6132b7a6 fixed needs deps; 2021-05-11 17:19:52 +02:00
Marco Zeisler 578b60b49f added needs dependencies 2021-05-11 17:18:16 +02:00
Marco Zeisler b88542c970 added comments; 
change stage order;
 2021-05-11 17:15:57 +02:00
Marco Zeisler 6c9df4fb30 fix circular dependency 2021-05-11 17:12:18 +02:00
Marco Zeisler 601384d363 init 2021-05-11 17:03:39 +02:00
Marco Zeisler 91d6020e10 update to assignment 3 2021-05-11 16:58:07 +02:00
Marco Zeisler 499072f9dc updated hash due to new image; 2021-05-04 22:58:38 +02:00
Marco Zeisler 2edb3da55f added default icon 2021-05-04 22:52:44 +02:00
Marco Zeisler 77cecb1e7c updated 2021-05-04 22:42:14 +02:00
Marco Zeisler 8876013c7a return only 200er ok 2021-05-04 22:27:25 +02:00
Marco Zeisler 45ea7716d0 remove twitter auth, does not work 2021-05-04 22:26:04 +02:00
Marco Zeisler 53c134021e use angular cli server; 2021-05-04 22:22:08 +02:00
Marco Zeisler db52ac7b75 update 2021-05-04 22:09:12 +02:00
Marco Zeisler ffb0a74e89 Merge remote-tracking branch 'origin/master' 2021-05-04 21:49:32 +02:00
Marco Zeisler c7bbafd94e remove default.conf 2021-05-04 21:49:24 +02:00
Marco Zeisler c629988bbf copy properly 2021-05-04 21:40:02 +02:00
Marco Zeisler 6a913f35c6 copy nginx conf 
added default.conf
 2021-05-04 21:32:30 +02:00
Marco Zeisler 79a9e0edd5 bump to bsp-2 2021-05-04 20:57:22 +02:00
Marco Zeisler 438168fbc2 fix post_logout_redirect_uri 2021-05-04 20:56:56 +02:00
Marco Zeisler 7a1877072b remove whitespaces 2021-05-04 20:47:40 +02:00
Marco Zeisler 9d1d3f8be6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/app_be/views/twitter_api.py
 2021-05-04 20:41:34 +02:00
Marco Zeisler 582bbb4c93 use manage.py server 2021-05-04 20:41:20 +02:00
Marco Zeisler 8f1272afcf remove gunicorn 2021-05-04 20:41:12 +02:00
Marco Zeisler ed9356b7f9 use logging instead of prints; 2021-05-04 20:41:03 +02:00
Marco Zeisler 930e23a01e rename 2021-05-04 20:28:04 +02:00
Marco Zeisler 77587b5194 fix openid connection redirect 2021-05-04 20:18:33 +02:00
Marco Zeisler edac97ec8e fix redirect_uri 2021-05-04 20:15:33 +02:00
Marco Zeisler f724154248 re-added openid endpoint 2021-05-04 19:54:38 +02:00
Marco Zeisler ccd241b5df update; 2021-05-04 19:47:59 +02:00
Marco Zeisler 6abe9ebc35 added vars; 
fix docker-compose.yml;
 2021-05-04 19:37:58 +02:00
Marco Zeisler 560c688817 fix wsgi.py; 
added entrypoint.sh as django entrypoint;
install and use gunicorn as prod server;
 2021-05-04 19:37:38 +02:00