From 92065e4a8cbc452b6533db3c7b07be7f0d1fb82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 22:52:08 +0200 Subject: [PATCH 01/45] Update '.drone.yml' --- .drone.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 16ac98d..4ac4ca8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,4 +24,16 @@ 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 ] + +- name: docker-dafl + image: plugins/docker + settings: + dockerfile: Sources/Dockerfile + context: Sources/ + registry: hub.codefirst.iut.uca.fr + repo: hub.codefirst.iut.uca.fr/felix.mielcarek/DAFLMusic + username: + from_secret: secret-registry-username + password: + from_secret: secret-registry-password \ No newline at end of file -- 2.36.3 From 4bc68afe1c7bad72afae81043e1ba256d8a2bc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 22:58:39 +0200 Subject: [PATCH 02/45] Add 'Sources/Dockerfile' --- Sources/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Sources/Dockerfile diff --git a/Sources/Dockerfile b/Sources/Dockerfile new file mode 100644 index 0000000..3a24ee9 --- /dev/null +++ b/Sources/Dockerfile @@ -0,0 +1,2 @@ +FROM plugins/docker +CMD ["echo", "Hello world"] \ No newline at end of file -- 2.36.3 From 9c423e0da28a7ca05ecb986ba6930b5cd383361f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:01:42 +0200 Subject: [PATCH 03/45] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4ac4ca8..44775ab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,7 @@ steps: dockerfile: Sources/Dockerfile context: Sources/ registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/felix.mielcarek/DAFLMusic + repo: hub.codefirst.iut.uca.fr/felix.mielcarek/dafl_music username: from_secret: secret-registry-username password: -- 2.36.3 From a8b028c1e037a693c0dda0e889dc3e3977420c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:17:45 +0200 Subject: [PATCH 04/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 3a24ee9..5831fe1 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -1,2 +1,7 @@ FROM plugins/docker -CMD ["echo", "Hello world"] \ No newline at end of file +RUN apt update +RUN apt install –y apache2 +RUN apt install –y apache2-utils +RUN apt clean +EXPOSE 80 +CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From e7dea64f05891529e1f69e595e00920b4653a234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:19:38 +0200 Subject: [PATCH 05/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 5831fe1..6eb3645 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -1,7 +1,7 @@ FROM plugins/docker -RUN apt update -RUN apt install –y apache2 -RUN apt install –y apache2-utils -RUN apt clean +RUN apk update +RUN apk install –y apache2 +RUN apk install –y apache2-utils +RUN apk clean EXPOSE 80 CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From 4199ea60c058dcbc220b3ff1b31bfb9b9c30c3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:21:43 +0200 Subject: [PATCH 06/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 6eb3645..0032a35 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -1,7 +1,7 @@ FROM plugins/docker RUN apk update -RUN apk install –y apache2 -RUN apk install –y apache2-utils -RUN apk clean +RUN apk add –y apache2 +RUN apk add –y apache2-utils +RUN apk cache -v sync EXPOSE 80 CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From 7b474751ec2e68540726604c24fd478ab3f08c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:22:45 +0200 Subject: [PATCH 07/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 0032a35..1b4044a 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -1,7 +1,7 @@ FROM plugins/docker RUN apk update -RUN apk add –y apache2 -RUN apk add –y apache2-utils +RUN apk add apache2 +RUN apk add apache2-utils RUN apk cache -v sync EXPOSE 80 CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From 6b3e0fb145de9e2a16353bc3a9b2d7f5268f4733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:23:38 +0200 Subject: [PATCH 08/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 1b4044a..76c75b1 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -2,6 +2,6 @@ FROM plugins/docker RUN apk update RUN apk add apache2 RUN apk add apache2-utils -RUN apk cache -v sync +RUN apk cache clean EXPOSE 80 CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From eec3a1dd0b0405006c963a74a7b02c1f04e89ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Fri, 28 Oct 2022 23:24:12 +0200 Subject: [PATCH 09/45] Update 'Sources/Dockerfile' --- Sources/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sources/Dockerfile b/Sources/Dockerfile index 76c75b1..4b345c3 100644 --- a/Sources/Dockerfile +++ b/Sources/Dockerfile @@ -1,7 +1,6 @@ FROM plugins/docker RUN apk update RUN apk add apache2 -RUN apk add apache2-utils -RUN apk cache clean +RUN apk add apache2-utils EXPOSE 80 CMD [“apache2ctl”, “-D”, “FOREGROUND”] \ No newline at end of file -- 2.36.3 From 2e9348fd6a19d4eb80f639c728fefdabcdacff18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 07:08:06 +0200 Subject: [PATCH 10/45] Update '.drone.yml' --- .drone.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 44775ab..066a9d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,13 +26,25 @@ steps: - sonar-scanner -D sonar.projectKey=DAFLMusic -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar depends_on: [ app-build ] -- name: docker-dafl +- 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: -- 2.36.3 From 3f23e3928006c077e6ec3f5e92f2a5ecac32b73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 07:11:09 +0200 Subject: [PATCH 11/45] Update '.drone.yml' --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 066a9d2..b50bda8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,4 +48,5 @@ steps: username: from_secret: secret-registry-username password: - from_secret: secret-registry-password \ No newline at end of file + from_secret: secret-registry-password + depends_on: [ web-server, app-build ] \ No newline at end of file -- 2.36.3 From 8bf84856fddd3d3d7f4ac86ff7da06b2aa9e7331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 12:38:00 +0200 Subject: [PATCH 12/45] remove app-build from container dependences --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b50bda8..2f691c2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,4 +49,4 @@ steps: from_secret: secret-registry-username password: from_secret: secret-registry-password - depends_on: [ web-server, app-build ] \ No newline at end of file + depends_on: [ web-server ] \ No newline at end of file -- 2.36.3 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 13/45] 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 14/45] 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 15/45] 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 16/45] 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 17/45] 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 18/45] 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 19/45] 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 20/45] 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 21/45] 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 22/45] 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 23/45] 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 24/45] 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 25/45] 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 From 0e55668a63bfedcd7feefe683020bd5499e88361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:50:06 +0200 Subject: [PATCH 26/45] Update '.drone.yml' Test deploy container for web server --- .drone.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 815c081..ed9a5f3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,4 +31,13 @@ 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 ] + +# container deployment +- name: deploy-container + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: httpd:2.4 + CONTAINERNAME: api-redirect + COMMAND: create + OVERWRITE: true \ No newline at end of file -- 2.36.3 From 722d4abf8c6cfc0b3a30d3ccd1a23b3aa0dec1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:58:13 +0200 Subject: [PATCH 27/45] Delete 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Sources/api_redirect/Dockerfile diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile deleted file mode 100644 index 9b7bb3d..0000000 --- a/Sources/api_redirect/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM httpd:2.4 -COPY ./public-html/ /usr/local/apache2/htdocs/ -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 fc4f61af9ea90c1ce243842529c1e8bee696b2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 18:58:21 +0200 Subject: [PATCH 28/45] Delete 'Sources/api_redirect/.gitkeep' --- Sources/api_redirect/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sources/api_redirect/.gitkeep diff --git a/Sources/api_redirect/.gitkeep b/Sources/api_redirect/.gitkeep deleted file mode 100644 index e69de29..0000000 -- 2.36.3 From 7da5316cce54f17551bda256294e7d5730e7135a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:10:25 +0200 Subject: [PATCH 29/45] Update '.drone.yml' --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ed9a5f3..25f005d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,4 +40,6 @@ steps: IMAGENAME: httpd:2.4 CONTAINERNAME: api-redirect COMMAND: create - OVERWRITE: true \ No newline at end of file + OVERWRITE: true + commands: + - echo test > $HOME/public-html/index.html \ No newline at end of file -- 2.36.3 From 0a5742a465d3778a079a6b2d1c215984642e81f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:16:04 +0200 Subject: [PATCH 30/45] Update '.drone.yml' --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 25f005d..f0d8dd1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,10 +36,10 @@ steps: # container deployment - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + settings: + - dockerfile: ./Sources/api-redirect/Dockerfile environment: IMAGENAME: httpd:2.4 CONTAINERNAME: api-redirect COMMAND: create - OVERWRITE: true - commands: - - echo test > $HOME/public-html/index.html \ No newline at end of file + OVERWRITE: true \ No newline at end of file -- 2.36.3 From e9b5d297d0a5a01e73be4ae63b536384e99c7732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:17:44 +0200 Subject: [PATCH 31/45] 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..bef31a3 --- /dev/null +++ b/Sources/api_redirect/Dockerfile @@ -0,0 +1,2 @@ +FROM httpd:2.4 +COPY ./src/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3 From 529838ff3ac3c29913fbc56a6b1175868313a7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:18:05 +0200 Subject: [PATCH 32/45] Delete 'Sources/api_redirect/public-html/index.html' --- Sources/api_redirect/public-html/index.html | 5 ----- 1 file changed, 5 deletions(-) delete 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 deleted file mode 100644 index 5462420..0000000 --- a/Sources/api_redirect/public-html/index.html +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World !

- - \ No newline at end of file -- 2.36.3 From 87257571e278d9bfd192635c08104841cc9a6e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:18:11 +0200 Subject: [PATCH 33/45] Delete 'Sources/api_redirect/public-html/callback/index.html' --- Sources/api_redirect/public-html/callback/index.html | 1 - 1 file changed, 1 deletion(-) delete 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 deleted file mode 100644 index 70c379b..0000000 --- a/Sources/api_redirect/public-html/callback/index.html +++ /dev/null @@ -1 +0,0 @@ -Hello world \ No newline at end of file -- 2.36.3 From ca0ef9e325b8dfc7ffa9e70f3128a647a23a1990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:18:37 +0200 Subject: [PATCH 34/45] Add 'Sources/api_redirect/src/index.html' --- Sources/api_redirect/src/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 Sources/api_redirect/src/index.html diff --git a/Sources/api_redirect/src/index.html b/Sources/api_redirect/src/index.html new file mode 100644 index 0000000..4f1af38 --- /dev/null +++ b/Sources/api_redirect/src/index.html @@ -0,0 +1 @@ +Hello world Dafl ! \ No newline at end of file -- 2.36.3 From 62ea2f7cc3e697027677d041d5b4a29f307dcdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:18:55 +0200 Subject: [PATCH 35/45] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f0d8dd1..e3d61c5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ steps: - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest settings: - - dockerfile: ./Sources/api-redirect/Dockerfile + - dockerfile: ./Sources/api_redirect/Dockerfile environment: IMAGENAME: httpd:2.4 CONTAINERNAME: api-redirect -- 2.36.3 From bebe8679d554ee41335196f95042077f44d4df01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:19:39 +0200 Subject: [PATCH 36/45] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e3d61c5..d824b37 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ steps: - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest settings: - - dockerfile: ./Sources/api_redirect/Dockerfile + dockerfile: ./Sources/api_redirect/Dockerfile environment: IMAGENAME: httpd:2.4 CONTAINERNAME: api-redirect -- 2.36.3 From 145dcecbb398370d0ed57d33f0fa88ee16067761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:22:44 +0200 Subject: [PATCH 37/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index bef31a3..bde780c 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,2 @@ FROM httpd:2.4 -COPY ./src/ /usr/local/apache2/htdocs/ \ No newline at end of file +COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3 From 78a39338054018b416a544a1c79e336d2572814a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:23:22 +0200 Subject: [PATCH 38/45] Update 'Sources/api_redirect/public-html/index.html' --- Sources/api_redirect/{src => public-html}/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Sources/api_redirect/{src => public-html}/index.html (100%) diff --git a/Sources/api_redirect/src/index.html b/Sources/api_redirect/public-html/index.html similarity index 100% rename from Sources/api_redirect/src/index.html rename to Sources/api_redirect/public-html/index.html -- 2.36.3 From 4cd260aa823b5a73745de2df8b52e5faa3d415ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:32:12 +0200 Subject: [PATCH 39/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index bde780c..f347378 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,2 @@ FROM httpd:2.4 -COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file +COPY ./public-html/ /var/www/html/ \ No newline at end of file -- 2.36.3 From 4e78d635b231f188e04a8f334d231122c7303bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:40:52 +0200 Subject: [PATCH 40/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index f347378..bde780c 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,2 @@ FROM httpd:2.4 -COPY ./public-html/ /var/www/html/ \ No newline at end of file +COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3 From a6864ea9bc661cce38c6bc3aa2e8bdc8dafa18a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:51:00 +0200 Subject: [PATCH 41/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index bde780c..a9c5818 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,10 @@ +#FROM httpd:2.4 +#COPY ./public-html/ /usr/local/apache2/htdocs/ + FROM httpd:2.4 -COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file +COPY ./public-html/ /usr/local/apache2/htdocs/ +RUN mkdir -p /run/apache2/ && \ + chown www-data:www-data /run/apache2/ && \ + chmod 777 /run/apache2/ + +EXPOSE 80 443 \ No newline at end of file -- 2.36.3 From 64d58a66d6abd86c39d0439f0699e55192fa02b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:51:42 +0200 Subject: [PATCH 42/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index a9c5818..8cb7ad2 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -2,7 +2,7 @@ #COPY ./public-html/ /usr/local/apache2/htdocs/ FROM httpd:2.4 -COPY ./public-html/ /usr/local/apache2/htdocs/ +COPY ./public-html/index.html /usr/local/apache2/htdocs/index.html RUN mkdir -p /run/apache2/ && \ chown www-data:www-data /run/apache2/ && \ chmod 777 /run/apache2/ -- 2.36.3 From 30d449e21d150c75ea54e494c774cff37482f6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 19:55:59 +0200 Subject: [PATCH 43/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index 8cb7ad2..4627c39 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -2,9 +2,7 @@ #COPY ./public-html/ /usr/local/apache2/htdocs/ FROM httpd:2.4 -COPY ./public-html/index.html /usr/local/apache2/htdocs/index.html -RUN mkdir -p /run/apache2/ && \ - chown www-data:www-data /run/apache2/ && \ - chmod 777 /run/apache2/ - -EXPOSE 80 443 \ No newline at end of file +WORKDIR /usr/local/apache2/htdocs/ +RUN chmod -R 755 /usr/local/apache2/htdocs/ +COPY ./public-html/index.html /usr/local/apache2/htdocs/ +RUN chown www-data:www-data /usr/local/apache2/htdocs/ -R \ No newline at end of file -- 2.36.3 From 8bbe868499974200e6d55b0ef528fb7d2b1462fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 20:03:03 +0200 Subject: [PATCH 44/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index 4627c39..ee06c5f 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,8 +1,2 @@ -#FROM httpd:2.4 -#COPY ./public-html/ /usr/local/apache2/htdocs/ - -FROM httpd:2.4 -WORKDIR /usr/local/apache2/htdocs/ -RUN chmod -R 755 /usr/local/apache2/htdocs/ -COPY ./public-html/index.html /usr/local/apache2/htdocs/ -RUN chown www-data:www-data /usr/local/apache2/htdocs/ -R \ No newline at end of file +FROM httpd:2.4-alpine +COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3 From 1339a7ed366b0c20ea6fb1dca8aabaf7bc6dde21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MIELCAREK?= Date: Sat, 29 Oct 2022 20:17:35 +0200 Subject: [PATCH 45/45] Update 'Sources/api_redirect/Dockerfile' --- Sources/api_redirect/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/api_redirect/Dockerfile b/Sources/api_redirect/Dockerfile index ee06c5f..bde780c 100644 --- a/Sources/api_redirect/Dockerfile +++ b/Sources/api_redirect/Dockerfile @@ -1,2 +1,2 @@ -FROM httpd:2.4-alpine +FROM httpd:2.4 COPY ./public-html/ /usr/local/apache2/htdocs/ \ No newline at end of file -- 2.36.3