Saving work for the day. Stopped at the >Web Server portion of the assignment,...

Saving work for the day. Stopped at the >Web Server portion of the assignment, after copying the directories into web

Saving work for the day. Stopped at the >Web Server portion of the assignment,...
Saving work for the day. Stopped at the >Web Server portion of the assignment, after copying the directories into web
06c7964c · Bradon Ladd · 980a88a1 · 06c7964c · 06c7964c · 06c7964c
Verified Commit 06c7964c authored Jan 24, 2022 by Bradon Ladd
9 changed files
--- a/lab-06/code/Dockerfile
+++ b/lab-06/code/Dockerfile
+FROM gcc:10.2.0
+
+COPY . /usr/src/code
+
+WORKDIR /usr/src/code
+
+RUN g++ -std=c++20 -o area areaMain.cpp areaFunction.cpp
\ No newline at end of file
--- a/lab-06/code/area
+++ b/lab-06/code/area
--- a/lab-06/code/areaMain.cpp
+++ b/lab-06/code/areaMain.cpp
@@ -19,9 +19,17 @@ int main(int argc, char *argv[]) {
  }
  float squareArea = areaOfSquareWithSides(argument);
  float circleArea = areaOfCircleWithRadius(argument);
-  std::cout << "The area of a square with sides of " << argument << " units is "
-            << squareArea << " units." << std::endl;
-  std::cout << "The area of a circle with a radius of " << argument
-            << " units is " << circleArea << " units." << std::endl;
+  std::cout << "Content-type: text/html;\n\n"
+               "<!doctype html>\n"
+               "<html itemtype=\"http://schema.org/WebPage\" lang=\"en\">\n"
+               "<head><meta charset=\"UTF-8\">\n"
+               "<title>Area Calculator Results</title>"
+               "</head>"
+               "<body>"
+               "<p>The area of a square with sides of " << argument << " units is " << squareArea << " units.</p>"
+               "<p>The area of a circle with radius of "<< argument << " units is " << circleArea << " units.</p>"
+               "<p><a href=\"/\">Home</a></p>"
+               "</body>"
+               "</html>" << std::endl;
  return 0;
 }
--- a/lab-06/code/docker-compose.yml
+++ b/lab-06/code/docker-compose.yml
+version: '3'
+
+services:
+  gcc:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: gcc
\ No newline at end of file
--- a/lab-06/web/Dockerfile
+++ b/lab-06/web/Dockerfile
+FROM httpd:2.4
+
+COPY ./public-html/ /usr/local/apache2/htdocs/
+
+COPY ./cgi-bin/ /usr/local/apache2/cgi-bin/
+
+COPY ./my-httpd.conf /usr/local/apache2/conf/httpd.conf
\ No newline at end of file
--- a/lab-06/web/cgi-bin/test-cgi.sh
+++ b/lab-06/web/cgi-bin/test-cgi.sh
+#!/bin/bash
+# disable filename globbing
+set -f
+echo "Content-type: text/plain; charset=iso-8859-1"
+echo
+echo CGI/1.0 test script report:
+echo
+echo argc is $#. argv is "$*".
+echo
+echo SERVER_SOFTWARE = $SERVER_SOFTWARE
+echo SERVER_NAME = $SERVER_NAME
+echo GATEWAY_INTERFACE = $GATEWAY_INTERFACE
+echo SERVER_PROTOCOL = $SERVER_PROTOCOL
+echo SERVER_PORT = $SERVER_PORT
+echo REQUEST_METHOD = $REQUEST_METHOD
+echo HTTP_ACCEPT = "$HTTP_ACCEPT"
+echo PATH_INFO = "$PATH_INFO"
+echo PATH_TRANSLATED = "$PATH_TRANSLATED"
+echo SCRIPT_NAME = "$SCRIPT_NAME"
+echo QUERY_STRING = "$QUERY_STRING"
+echo REMOTE_HOST = $REMOTE_HOST
+echo REMOTE_ADDR = $REMOTE_ADDR
+echo REMOTE_USER = $REMOTE_USER
+echo AUTH_TYPE = $AUTH_TYPE
+echo CONTENT_TYPE = $CONTENT_TYPE
+echo CONTENT_LENGTH = $CONTENT_LENGTH
\ No newline at end of file
--- a/lab-06/web/docker-compose.yml
+++ b/lab-06/web/docker-compose.yml
+version: '3'
+
+services:
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: web
+    ports:
+      - 80:80
\ No newline at end of file
--- a/lab-06/web/my-httpd.conf
+++ b/lab-06/web/my-httpd.conf
--- a/lab-06/web/public-html/index.html
+++ b/lab-06/web/public-html/index.html
+<html>
+    <body>
+        <h1>Wow! A docker container running!</h1>
+    </body>
+</html>
\ No newline at end of file