From c0bc3cce71ea95e423ff4dbea7d9f320d6aab16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:06:41 +0200 Subject: [PATCH 01/13] Update '.drone.yml' --- .drone.yml | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2f691c2..49ac325 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,13 +2,19 @@ kind: pipeline type: docker name: DAFLPipeline +trigger: + event: + - push + steps: +# build CONTAINER for app-build on cirrusci IMAGE - name: app-build image: cirrusci/flutter:stable commands: - flutter doctor - - flutter build - + - flutter build ./Sources/dafl_project_flutter + +# build CONTAINER for sonar on cirrusci IMAGE - name: code-analysis image: cirrusci/flutter:stable environment: @@ -24,29 +30,4 @@ steps: - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - export SONAR_SCANNER_OPTS="-server" - sonar-scanner -D sonar.projectKey=DAFLMusic -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar - depends_on: [ app-build ] - -- name: web-server - image: plugins/docker - settings: - dockerfile: Sources/Dockerfile - context: Sources/ - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/felix.mielcarek/dafl_music - username: - from_secret: secret-registry-username - password: - from_secret: secret-registry-password - -- name: deploy-container - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest - environment: - IMAGENAME: hub.codefirst.iut.uca.fr/felix.mielcarek/dafl_music:latest - CONTAINERNAME: dafl-container - COMMAND: create - OVERWRITE: true - username: - from_secret: secret-registry-username - password: - from_secret: secret-registry-password - depends_on: [ web-server ] \ No newline at end of file + depends_on: [ app-build ] \ No newline at end of file -- 2.36.3 From 221b832caf96ce449b28eebb6be088264d986db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:07:26 +0200 Subject: [PATCH 02/13] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 49ac325..3dfee68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: image: cirrusci/flutter:stable commands: - flutter doctor - - flutter build ./Sources/dafl_project_flutter + - flutter build # build CONTAINER for sonar on cirrusci IMAGE - name: code-analysis -- 2.36.3 From 96aa066ddf1e1f0c082e9b9ed5aacc8b8244a8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:08:33 +0200 Subject: [PATCH 03/13] Update '.drone.yml' --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3dfee68..ac77162 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,8 @@ steps: image: cirrusci/flutter:stable commands: - flutter doctor - - flutter build + - cd ./Sources/ + - flutter build apk # build CONTAINER for sonar on cirrusci IMAGE - name: code-analysis -- 2.36.3 From ae945c86cc054fb1f137725bae158d1bef636b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:09:26 +0200 Subject: [PATCH 04/13] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ac77162..815c081 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: image: cirrusci/flutter:stable commands: - flutter doctor - - cd ./Sources/ + - cd ./Sources/dafl_project_flutter/ - flutter build apk # build CONTAINER for sonar on cirrusci IMAGE -- 2.36.3 From d0ffbc6d24b89afb0a472f95ae5974cc2e486428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:19:24 +0200 Subject: [PATCH 05/13] Update '.drone.yml' --- .drone.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 815c081..602e94f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,4 +31,17 @@ steps: - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - export SONAR_SCANNER_OPTS="-server" - sonar-scanner -D sonar.projectKey=DAFLMusic -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar - depends_on: [ app-build ] \ No newline at end of file + depends_on: [ app-build ] + + # build CONTAINER for web server on httpd IMAGE +- name: web-server + image: httpd:2.4 + settings: + dockerfile: Sources/api_redirect/Dockerfile + context: Sources/api_redirect/ + registry: hub.codefirst.iut.uca.fr + repo: hub.codefirst.iut.uca.fr/felix.mielcarek/dafl_music + username: + from_secret: secret-registry-username + password: + from_secret: secret-registry-password \ No newline at end of file -- 2.36.3 From ceeb714a2749953b8f8c0e1614ca25f35fe5b3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:19:38 +0200 Subject: [PATCH 06/13] Delete 'Sources/Dockerfile' --- Sources/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 Sources/Dockerfile diff --git a/Sources/Dockerfile b/Sources/Dockerfile deleted file mode 100644 index 4b345c3..0000000 --- a/Sources/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM plugins/docker -RUN apk update -RUN apk add apache2 -RUN apk add apache2-utils -EXPOSE 80 -CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From 9f0e901a5aaa90c39e65e3947c6a63b76df9cc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:20:02 +0200 Subject: [PATCH 07/13] Add 'Sources/api_redirect/.gitkeep' --- Sources/api_redirect/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sources/api_redirect/.gitkeep diff --git a/Sources/api_redirect/.gitkeep b/Sources/api_redirect/.gitkeep new file mode 100644 index 0000000..e69de29 -- 2.36.3 From 10ec7c76551cd94e2fe166abe7f14598e13b4f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:20:53 +0200 Subject: [PATCH 08/13] Add 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Sources/api_redirect/Dockerfile diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile new file mode 100644 index 0000000..bde780c --- /dev/null +++ b/Sources/api_redirect/Dockerfile @@ -0,0 +1,2 @@ +FROM httpd:2.4 +COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3 From 680c3e7973a8c514aa6c068edf28214e443cb695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:22:32 +0200 Subject: [PATCH 09/13] Add 'Sources/api_redirect/public-html/index.html' --- Sources/api_redirect/public-html/index.html | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Sources/api_redirect/public-html/index.html diff --git a/Sources/api_redirect/public-html/index.html b/Sources/api_redirect/public-html/index.html new file mode 100644 index 0000000..5462420 --- /dev/null +++ b/Sources/api_redirect/public-html/index.html @@ -0,0 +1,5 @@ + + +

Hello World !

+ + \ No newline at end of file -- 2.36.3 From 92e4933dfbead5cd63f9019c2145ba083ea62549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 16:47:10 +0200 Subject: [PATCH 10/13] Add 'Sources/api_redirect/public-html/callback/index.html' --- Sources/api_redirect/public-html/callback/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 Sources/api_redirect/public-html/callback/index.html diff --git a/Sources/api_redirect/public-html/callback/index.html b/Sources/api_redirect/public-html/callback/index.html new file mode 100644 index 0000000..70c379b --- /dev/null +++ b/Sources/api_redirect/public-html/callback/index.html @@ -0,0 +1 @@ +Hello world \ No newline at end of file -- 2.36.3 From 16fab6d3afec7e8fca6fd65f96a5659645eee34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:00:11 +0200 Subject: [PATCH 11/13] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index bde780c..92b186e 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,3 @@ FROM httpd:2.4 -COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file +COPY ./public-html/ /usr/local/apache2/htdocs/ +CMD echo 'ServerName 127.0.0.1' >> /etc/httpd/conf/httpd.conf \ No newline at end of file -- 2.36.3 From 566a7435fbf3bb99b194bc1c20388ef20ed1c14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:06:22 +0200 Subject: [PATCH 12/13] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index 92b186e..9b7bb3d 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,3 +1,4 @@ FROM httpd:2.4 COPY ./public-html/ /usr/local/apache2/htdocs/ -CMD echo 'ServerName 127.0.0.1' >> /etc/httpd/conf/httpd.conf \ No newline at end of file +CMD echo 'ServerName 127.0.0.1' >> /etc/httpd/conf/httpd.conf +CMD systemctl reload httpd \ No newline at end of file -- 2.36.3 From e5ba911f93c8d9f8138d3ae75098f1891ecad7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:31:38 +0200 Subject: [PATCH 13/13] Update '.drone.yml' --- .drone.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 602e94f..815c081 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,17 +31,4 @@ steps: - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - export SONAR_SCANNER_OPTS="-server" - sonar-scanner -D sonar.projectKey=DAFLMusic -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar - depends_on: [ app-build ] - - # build CONTAINER for web server on httpd IMAGE -- name: web-server - image: httpd:2.4 - settings: - dockerfile: Sources/api_redirect/Dockerfile - context: Sources/api_redirect/ - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/felix.mielcarek/dafl_music - username: - from_secret: secret-registry-username - password: - from_secret: secret-registry-password \ No newline at end of file + depends_on: [ app-build ] \ No newline at end of file -- 2.36.3