diff --git a/.github/workflows/memory.yml b/.github/workflows/memory.yml new file mode 100644 index 0000000..b8c118c --- /dev/null +++ b/.github/workflows/memory.yml @@ -0,0 +1,57 @@ +name: Memory Workflow + +on: + push: + branches: + - develop + +jobs: + test-memory-2026: + name: Test JPEG files + runs-on: self-hosted + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Check JPG files + run: | + for file in $(find . -type f -name "*.jpg"); do + file "$file" + done + + build-memory-2026: + name: Build Docker Image + runs-on: self-hosted + needs: test-memory-2026 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Build Docker Image + run: docker build -t hadrien17200/memory-2026 . + + push-memory-2026: + name: Push Docker Image + runs-on: self-hosted + needs: build-memory-2026 + steps: + - name: Docker login + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + + - name: Push image to Docker Hub + run: docker push hadrien17200/memory-2026 + + deploy-memory-2026: + name: Deploy via docker-compose on runner + runs-on: self-hosted + needs: push-memory-2026 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Deploy with docker-compose + run: | + cd /home/hadrien/TpMemory/memory + docker-compose pull + docker-compose down + docker-compose up -d --build diff --git a/.gitignore b/.gitignore index 496ee2c..26650df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -.DS_Store \ No newline at end of file +.DS_Store + +# Docker +*.tar +docker-compose.override.yml +.docker/ + +# Runner self-hosted +_runner/ +runner/ diff --git a/conf/nginx.conf b/conf/nginx.conf index 444b73a..e4d6770 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,40 +1,37 @@ worker_processes auto; events { - worker_connections 1024; + worker_connections 1024; } - http { - server { - listen 80; - server_name 127.0.0.1; - port_in_redirect off; - - location / { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_cache_bypass $http_upgrade; - root /var/concentration/html; - } + include mime.types; + default_type application/octet-stream; - location /cheat { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_cache_bypass $http_upgrade; - alias /var/concentration/html/; - index cheat.html; + types { + application/javascript js; + text/plain pde; } - } -} \ No newline at end of file + server { + listen 80; + server_name localhost; + + root /var/concentration/html; + index index.html; + + location /code/ { + alias /var/concentration/html/code/; + autoindex on; + } + + location /cheat { + alias /var/concentration/html/; + index cheat.html; + } + + location ~* \.(js|pde)$ { + default_type application/javascript; + } + } +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..dfb0a10 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: "3.9" + +services: + memory: + build: . + container_name: memory-game + ports: + - "8080:80" + restart: unless-stopped diff --git a/dockerfile b/dockerfile new file mode 100644 index 0000000..1ac6bfd --- /dev/null +++ b/dockerfile @@ -0,0 +1,17 @@ +FROM nginx:latest + +# Installer file +RUN apt-get update && apt-get install -y file && rm -rf /var/lib/apt/lists/* + +# Copier la conf nginx +COPY conf/nginx.conf /etc/nginx/nginx.conf + +# Copier les fichiers HTML +COPY html/ /var/concentration/html/ + +# Exposer le port 80 +EXPOSE 80 + +# Lancer nginx en foreground +CMD ["nginx", "-g", "daemon off;"] + diff --git a/html/cheat.html b/html/cheat.html old mode 100644 new mode 100755 index 3167106..159e8ad --- a/html/cheat.html +++ b/html/cheat.html @@ -6,7 +6,7 @@
- +
diff --git a/html/code/concentration-cheat.pde b/html/code/concentration-cheat.pde old mode 100644 new mode 100755 diff --git a/html/code/concentration.pde b/html/code/concentration.pde old mode 100644 new mode 100755 diff --git a/html/data/0 - Copie.jpg:Zone.Identifier b/html/data/0 - Copie.jpg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/html/data/0.jpg b/html/data/0.jpg old mode 100755 new mode 100644 index 0e259d4..63063a6 Binary files a/html/data/0.jpg and b/html/data/0.jpg differ diff --git a/html/data/11 - Copie.jpg:Zone.Identifier b/html/data/11 - Copie.jpg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/html/data/11.jpg b/html/data/11.jpg old mode 100755 new mode 100644 index 0e259d4..63063a6 Binary files a/html/data/11.jpg and b/html/data/11.jpg differ diff --git a/html/data/11.txt b/html/data/11.txt new file mode 100755 index 0000000..0e259d4 --- /dev/null +++ b/html/data/11.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/html/data/15.jpg b/html/data/15.jpg old mode 100755 new mode 100644 index 0e259d4..63063a6 Binary files a/html/data/15.jpg and b/html/data/15.jpg differ diff --git a/html/data/28 - Copie.jpg:Zone.Identifier b/html/data/28 - Copie.jpg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/html/data/28.jpg b/html/data/28.jpg old mode 100755 new mode 100644 index 545b203..63063a6 Binary files a/html/data/28.jpg and b/html/data/28.jpg differ diff --git a/html/data/photo.jpg:Zone.Identifier b/html/data/photo.jpg:Zone.Identifier new file mode 100644 index 0000000..dc5547b --- /dev/null +++ b/html/data/photo.jpg:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://www.google.com/ +HostUrl=https://jpeg.org/images/jpeg-home.jpg diff --git a/html/index.html b/html/index.html old mode 100644 new mode 100755 index 02d0397..9c413dd --- a/html/index.html +++ b/html/index.html @@ -6,7 +6,7 @@
- +
diff --git a/html/processing-v1.6.6.js b/html/processing-v1.6.6.js old mode 100644 new mode 100755