From 01a08a72aa33002cb43e6855b324af1ca631e46d Mon Sep 17 00:00:00 2001 From: Aaron Renner Date: Tue, 28 Nov 2023 00:31:20 -0500 Subject: [PATCH 1/2] Added CI --- .github/workflows/docker.yml | 39 ++++++++++++++++++ Dockerfile | 5 +++ nginx/nginx.conf | 39 ++++++++++++++++++ {css => src/css}/bootstrap.css | 0 {css => src/css}/main.css | 0 {images => src/images}/passcheck.png | Bin index.html => src/index.html | 0 {js => src/js}/bootstrap.js | 0 {js => src/js}/generator.js | 0 {js => src/js}/hsimp.min.js | 0 {js => src/js}/pwned.js | 0 .../screenshots}/logo-wide.png | Bin {screenshots => src/screenshots}/logo.png | Bin .../screenshots}/screenshot1.png | Bin .../screenshots}/screenshot2.png | Bin .../screenshots}/screenshot3.png | Bin .../screenshots}/screenshot4.png | Bin 17 files changed, 83 insertions(+) create mode 100644 .github/workflows/docker.yml create mode 100644 Dockerfile create mode 100644 nginx/nginx.conf rename {css => src/css}/bootstrap.css (100%) rename {css => src/css}/main.css (100%) rename {images => src/images}/passcheck.png (100%) rename index.html => src/index.html (100%) rename {js => src/js}/bootstrap.js (100%) rename {js => src/js}/generator.js (100%) rename {js => src/js}/hsimp.min.js (100%) rename {js => src/js}/pwned.js (100%) rename {screenshots => src/screenshots}/logo-wide.png (100%) rename {screenshots => src/screenshots}/logo.png (100%) rename {screenshots => src/screenshots}/screenshot1.png (100%) rename {screenshots => src/screenshots}/screenshot2.png (100%) rename {screenshots => src/screenshots}/screenshot3.png (100%) rename {screenshots => src/screenshots}/screenshot4.png (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..62c30cc --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,39 @@ +name: Build and Push Docker Image + +on: + push: + branches: + - master + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v3 + with: + images: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }} + tags: type=raw,value=latest + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: Dockerfile.bundle + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4806991 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx:alpine + +# Install app +COPY ./nginx/nginx.conf /etc/nginx/nginx.conf +COPY ./src /usr/share/nginx/html \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..bafe632 --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,39 @@ +user nginx; +worker_processes 4; + +error_log /dev/stderr warn; +pid /var/run/nginx.pid; + +events { + worker_connections 128; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + sendfile on; + tcp_nopush on; + + keepalive_timeout 65; + + # Fix for https://stackoverflow.com/a/27551259 + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + + server { + listen 80 default_server; + access_log /dev/stdout main; + + location / { + root /usr/share/nginx/html; + index index.html; + } + } +} \ No newline at end of file diff --git a/css/bootstrap.css b/src/css/bootstrap.css similarity index 100% rename from css/bootstrap.css rename to src/css/bootstrap.css diff --git a/css/main.css b/src/css/main.css similarity index 100% rename from css/main.css rename to src/css/main.css diff --git a/images/passcheck.png b/src/images/passcheck.png similarity index 100% rename from images/passcheck.png rename to src/images/passcheck.png diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html diff --git a/js/bootstrap.js b/src/js/bootstrap.js similarity index 100% rename from js/bootstrap.js rename to src/js/bootstrap.js diff --git a/js/generator.js b/src/js/generator.js similarity index 100% rename from js/generator.js rename to src/js/generator.js diff --git a/js/hsimp.min.js b/src/js/hsimp.min.js similarity index 100% rename from js/hsimp.min.js rename to src/js/hsimp.min.js diff --git a/js/pwned.js b/src/js/pwned.js similarity index 100% rename from js/pwned.js rename to src/js/pwned.js diff --git a/screenshots/logo-wide.png b/src/screenshots/logo-wide.png similarity index 100% rename from screenshots/logo-wide.png rename to src/screenshots/logo-wide.png diff --git a/screenshots/logo.png b/src/screenshots/logo.png similarity index 100% rename from screenshots/logo.png rename to src/screenshots/logo.png diff --git a/screenshots/screenshot1.png b/src/screenshots/screenshot1.png similarity index 100% rename from screenshots/screenshot1.png rename to src/screenshots/screenshot1.png diff --git a/screenshots/screenshot2.png b/src/screenshots/screenshot2.png similarity index 100% rename from screenshots/screenshot2.png rename to src/screenshots/screenshot2.png diff --git a/screenshots/screenshot3.png b/src/screenshots/screenshot3.png similarity index 100% rename from screenshots/screenshot3.png rename to src/screenshots/screenshot3.png diff --git a/screenshots/screenshot4.png b/src/screenshots/screenshot4.png similarity index 100% rename from screenshots/screenshot4.png rename to src/screenshots/screenshot4.png From 737f12fb3013389c08c4110da5f4b7075a5536b1 Mon Sep 17 00:00:00 2001 From: Aaron Renner Date: Tue, 28 Nov 2023 00:32:44 -0500 Subject: [PATCH 2/2] Corrected docker ref --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 62c30cc..8b815c6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: Dockerfile.bundle + file: Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}