From 209f43b21ac9669814139e4dcfa7382d06c066ca Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:54:40 +0100 Subject: [PATCH 1/9] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 023f239..7e87da4 100644 --- a/README.md +++ b/README.md @@ -28,3 +28,6 @@ The project leverages the following technologies: | Docker Tag | GitHub Release | Nginx Version | PHP Version | Ubuntu Version | |-----|-------|-----|--------|--------| | latest | master Branch |1.17.2 | 8.3 | Latest | + + +adding a new line From 0a431ef52ea40798132b559b6884b4bbcb1f380d Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 13:02:39 +0100 Subject: [PATCH 2/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e87da4..25b654f 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,4 @@ The project leverages the following technologies: | latest | master Branch |1.17.2 | 8.3 | Latest | -adding a new line +adding a new line for From 68600b2e52553db4e9cb365a94af6c2479450d6a Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 13:55:15 +0100 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25b654f..f9d0605 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,4 @@ The project leverages the following technologies: | latest | master Branch |1.17.2 | 8.3 | Latest | -adding a new line for +adding a new line for test publish From bce33fada683176ebc8f7329135e9b9c5930c6b1 Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:49:58 +0100 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9d0605..cca0500 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,4 @@ The project leverages the following technologies: | latest | master Branch |1.17.2 | 8.3 | Latest | -adding a new line for test publish +adding a new line for test publish again From c6fd9491622f2aa151ad8c673d791a7b6b23968e Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:54:02 +0100 Subject: [PATCH 5/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cca0500..d3b0703 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,5 @@ The project leverages the following technologies: |-----|-------|-----|--------|--------| | latest | master Branch |1.17.2 | 8.3 | Latest | - +.. adding a new line for test publish again From 943209fd1920dcb4e0e0c5aab0be0d6c24248331 Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:58:54 +0100 Subject: [PATCH 6/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3b0703..7df57dc 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,5 @@ The project leverages the following technologies: |-----|-------|-----|--------|--------| | latest | master Branch |1.17.2 | 8.3 | Latest | -.. +.... adding a new line for test publish again From 81a3d49a0c06a19f94a531ee12aca1c387736704 Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:04:34 +0100 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7df57dc..74fe316 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This repository hosts the code for the StegTechHub tooling website. The website ## Technologies Used -The project leverages the following technologies: +The project leverages the following technologies:. - **Backend:** - PHP 8.3 From d92efbd7403a27e5c22aae10b1f3b9a4a42df610 Mon Sep 17 00:00:00 2001 From: William-eng <63299223+William-eng@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:16:45 +0100 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74fe316..4378a8d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This repository hosts the code for the StegTechHub tooling website. The website ## Technologies Used -The project leverages the following technologies:. +The project leverages the following technologies:.. - **Backend:** - PHP 8.3 From 318468adf45791fa301411d5e45153751e14d2a6 Mon Sep 17 00:00:00 2001 From: William-eng Date: Mon, 11 Nov 2024 00:49:51 +0100 Subject: [PATCH 9/9] update jenkins --- Dockerfile | 8 +++++--- html/functions.php | 16 ++++++++-------- tooling.yml | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 tooling.yml diff --git a/Dockerfile b/Dockerfile index 7eb19d5..3678c37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,15 @@ -FROM php:7-apache -MAINTAINER Tool Tooling +FROM php:7.2.32-apache-buster +#MAINTAINER Tool Tooling RUN docker-php-ext-install mysqli COPY apache-config.conf /etc/apache2/sites-available/000-default.conf COPY start-apache /usr/local/bin -RUN a2enmod rewrite +RUN chmod +x /usr/local/bin/start-apache && a2enmod rewrite # Copy application source COPY html /var/www RUN chown -R www-data:www-data /var/www +EXPOSE 80 + CMD ["start-apache"] diff --git a/html/functions.php b/html/functions.php index 5928405..3e60659 100644 --- a/html/functions.php +++ b/html/functions.php @@ -2,16 +2,16 @@ session_start(); // connect to database -$db = mysqli_connect('127.0.0.1', 'admin', 'admin', 'tooling'); +$db = mysqli_connect('mysql-server2', 'Willie', 'Password123', 'tooling'); // Check connection -// if (mysqli_connect_errno()) { -// echo "Failed to connect to MySQL: " . mysqli_connect_error(); -// exit(); -// } -// else{ -// echo "connected"; -// } +if (mysqli_connect_errno()) { +echo "Failed to connect to MySQL: " . mysqli_connect_error(); +exit(); +} +else{ +echo "connected"; +} // variable declaration $username = ""; diff --git a/tooling.yml b/tooling.yml new file mode 100644 index 0000000..3d5f82d --- /dev/null +++ b/tooling.yml @@ -0,0 +1,33 @@ +version: "3.9" +services: + tooling_frontend: + build: . + ports: + - "5001:80" + volumes: + - tooling_frontend:/var/www/html + links: + - db + networks: + - dbnet + + db: + image: mysql:5.7 + restart: always + container_name: mysql-server2 + environment: + MYSQL_DATABASE: tooling + MYSQL_USER: Willie + MYSQL_PASSWORD: Password123 + MYSQL_RANDOM_ROOT_PASSWORD: Password123 + volumes: + - db:/var/lib/mysql + networks: + - dbnet +volumes: + tooling_frontend: + db: + +networks: + dbnet: + driver: bridge \ No newline at end of file