cleanup

docs: minor typo

.github/workflows/cron.yml

@@ -0,0 +1,65 @@
+name: Matrix Cron Build
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 3 * * 1'
+
+jobs:
+  tags:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.fetcher.outputs.matrix }}
+    defaults:
+      run:
+        working-directory: tags
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      - run: bun i
+      - id: fetcher
+        run: bun .
+
+  build:
+    runs-on: ubuntu-latest
+    needs: tags
+    strategy:
+      matrix: ${{fromJson(needs.tags.outputs.matrix)}}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker Labels
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            cupcakearmy/static
+            ghcr.io/${{ github.repository }}
+          tags: ${{ matrix.tags }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          build-args: NGINX=${{ matrix.version }}
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/docker.yml

@@ -1,39 +0,0 @@
-name: docker
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Labels
-        id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
-        with:
-          images: cupcakearmy/static
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -1,23 +1,23 @@
-FROM alpine AS builder
-
-ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev"
-ARG NGINX_MODULES="--with-http_realip_module --with-threads --with-http_ssl_module --with-http_v2_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_secure_link_module"
-ARG NGINX=1.20.2
+# BUILDER
+FROM alpine:3 AS builder
 
+ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev curl"
 RUN apk add --no-cache ${DEP_DEV}
 
 WORKDIR /build
-
+ARG NGINX
 RUN curl https://nginx.org/download/nginx-${NGINX}.tar.gz | tar xz
 RUN mv nginx-${NGINX} nginx
 RUN git clone --recursive https://github.com/google/ngx_brotli.git
 
 WORKDIR /build/nginx
+ARG NGINX_MODULES="--with-http_realip_module --with-threads --with-http_ssl_module --with-http_v2_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_secure_link_module"
 RUN ./configure ${NGINX_MODULES} --add-module=../ngx_brotli
-RUN make && make install
-
+RUN make
+RUN make install
 
 
+# RUNNER
 FROM alpine
 
 ARG DEP_RUN="pcre openssl gd tzdata"
@@ -26,12 +26,9 @@ COPY --from=builder /usr/local/nginx /usr/local/nginx
 RUN apk add --no-cache ${DEP_RUN} \
 	&& ln -sf /dev/stdout /usr/local/nginx/logs/access.log \
 	&& ln -sf /dev/stderr /usr/local/nginx/logs/error.log
-
 COPY ./conf/nginx.conf /usr/local/nginx/conf/nginx.conf
 COPY ./conf/default.conf /usr/local/nginx/conf/sites/default.conf
 
 EXPOSE 80
-
 STOPSIGNAL SIGTERM
-
 CMD ["/usr/local/nginx/sbin/nginx", "-g", "daemon off;"]

README.md

@@ -1,8 +1,28 @@
 # NGINX Static Server
 
-This is a little docker image for histing static content efficiently.
+![Docker Pulls](https://img.shields.io/docker/pulls/cupcakearmy/static?style=flat-square)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/cupcakearmy/static/latest?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/cupcakearmy/static/latest?style=flat-square)
+
+This is a little docker image for hosting static content efficiently.
 **Supports ETags & Brotli/GZip** compression out of the box.
 
+Automatically builds the latest mainline and stable releases weekly.
+
+## Features
+
+- Brotli & GZip
+- ETag
+- No server tokens
+
+## Tags
+
+Tags follow the official nginx naming convention.
+
+- `mainline`, same as `latest`
+- `stable`
+- Specific version
+
 ## Quickstart 🚀
 
 ```yaml

tags/.gitignore

@@ -0,0 +1 @@
+node_modules

tags/README.md

@@ -0,0 +1,15 @@
+# tags
+
+To install dependencies:
+
+```bash
+bun install
+```
+
+To run:
+
+```bash
+bun run index.js
+```
+
+This project was created using `bun init` in bun v1.1.20. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.

tags/index.ts

@@ -0,0 +1,49 @@
+import { info, setOutput, setFailed } from '@actions/core'
+import semver from 'semver'
+
+// Fetch the current versions from the download page
+const URL = `https://nginx.org/en/download.html`
+const html = await fetch(URL).then((r) => r.text())
+
+// Find all the downloadable versions
+const re = /"\/download\/nginx-(\d+\.){3}tar\.gz"/g
+const matches = html.match(re)
+
+if (!matches) {
+  setFailed(`No versions found at ${URL}`)
+  process.exit(1)
+}
+
+// Clean up the matches to semver format
+function clean(match: string): string {
+  return match.replace(/"/g, '').replace('/download/nginx-', '').replace('.tar.gz', '')
+}
+const versions = matches.map(clean)
+
+// Filter
+// Get the two most up to date versions, mainline and stable
+const [mainline, stable] = versions.sort(semver.rcompare).slice(0, 2)
+
+if (!mainline || !stable) {
+  setFailed(`Could not find mainline and stable versions`)
+  process.exit(1)
+}
+
+function convert(version: string, additional: string[] = []) {
+  return {
+    version,
+    // https://github.com/docker/metadata-action#typeraw
+    tags: [version, ...additional].map((t) => `type=raw,value=${t}`).join('\n'),
+  }
+}
+
+// Export as github action matrix
+// https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
+const githubActionMatrix = {
+  include: [convert(mainline, ['latest', 'mainline']), convert(stable, ['stable'])],
+}
+
+const serialised = JSON.stringify(githubActionMatrix)
+info(`Found ${versions.length} versions`)
+info(`Exporting as github action matrix: ${serialised}`)
+setOutput('matrix', serialised)

tags/package.json

@@ -0,0 +1,16 @@
+{
+  "type": "module",
+  "main": "index.ts",
+  "dependencies": {
+    "@actions/core": "^1.10.1",
+    "semver": "^7.6.3"
+  },
+  "devDependencies": {
+    "@tsconfig/strictest": "^2.0.5",
+    "@types/bun": "latest",
+    "@types/semver": "^7.5.8"
+  },
+  "peerDependencies": {
+    "typescript": "^5.5.4"
+  }
+}

tags/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "@tsconfig/strictest",
+  "compilerOptions": {
+    // Enable latest features
+    "lib": ["ESNext", "DOM"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true
+  }
+}