diff --git a/Dockerfile b/Dockerfile index 79316a13216f587d2f9a327d07392c5b33eaaf38..6cfe1395304ca16bb470ea7ad0b13dac5858c187 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM nginx:alpine COPY nginx/default.conf.template /etc/nginx/templates/ -ENV SIGN_OUT_URL="#" -#COPY nginx/default.conf /etc/nginx/conf.d -COPY index.html /var/www/html/index.html +ENV POD_NAME="#" +ENV WORKER_NAME="#" +COPY webpage/* /var/www/html/ # \ No newline at end of file diff --git a/README.md b/README.md index 41cfd05ac800ada0886d4ffb925b886d2c6a4a18..07f0c367758f859f472163b0b50c601feff64a1c 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,3 @@ # nginx-demo-page - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://git.garr.it/cloud/garr-accademy/nginx-demo-page.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://git.garr.it/cloud/garr-accademy/nginx-demo-page/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +Demo page NGINX \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index 49a416bcc2efc62e5e20a3e53d326d004dbb8a83..0000000000000000000000000000000000000000 --- a/index.html +++ /dev/null @@ -1 +0,0 @@ -<a href="<!--#echo var="ssisignouturl"-->">Sign out</a> \ No newline at end of file diff --git a/nginx/default.conf b/nginx/default.conf deleted file mode 100644 index f4d381a7fd111d1b6164df3c25358de311bc44f6..0000000000000000000000000000000000000000 --- a/nginx/default.conf +++ /dev/null @@ -1,12 +0,0 @@ -server { - listen 0.0.0.0:80; - root /var/www/html; - location / { - ssi on; - index index.php index.html; - set $ssisignouturl "${SIGN_OUT_URL}"; - } - -} - - diff --git a/nginx/default.conf.template b/nginx/default.conf.template index f6ff802a67558602867df7be90d93959896f6ccf..e90a4b77412972133a53d39203b1ce8742e3b13e 100644 --- a/nginx/default.conf.template +++ b/nginx/default.conf.template @@ -4,7 +4,8 @@ server { location / { ssi on; index index.php index.html; - set $ssisignouturl "${SIGN_OUT_URL}"; + set $podname "${POD_NAME}"; + set $workername "${WORKER_NAME}"; } } diff --git a/webpage/index.html b/webpage/index.html new file mode 100644 index 0000000000000000000000000000000000000000..75aced48cb7fc6576538319b6d83934e9ab16da8 --- /dev/null +++ b/webpage/index.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html> +<head> +<style> +img { + width: 100%; +} + </style> +</head> +<body> + <img src="/testata-garr-academy.png"> + <p>Hello! I am the pod: <!--#echo var="podname"--></p> + <p>Hosted on the worker node: <!--#echo var="workername"--></p> + +</body> +</html> + diff --git a/webpage/testata-garr-academy.png b/webpage/testata-garr-academy.png new file mode 100644 index 0000000000000000000000000000000000000000..775a8cbe697d00f9ed387d12862cd74bd30b9759 Binary files /dev/null and b/webpage/testata-garr-academy.png differ