Updates (#2)

Author: smashedr

.github/workflows/build.yaml

@@ -1,11 +1,12 @@
 name: "Build"
 
 on:
-  workflow_dispatch:
-    inputs:
-      tags:
-        description: "Extra Tags: comma,separated"
-        required: false
+  # NOTE: workflow_dispatch no longer works because arg VERSION=${{ github.ref_name }}
+  #workflow_dispatch:
+  #  inputs:
+  #    tags:
+  #      description: "Extra Tags: comma,separated"
+  #      required: false
   release:
     types: [published]
 
@@ -39,8 +40,8 @@ jobs:
         id: version
         uses: cssnr/update-version-tags-action@v1
         with:
-          tags: ${{ inputs.tags }}
           prefix: ""
+          #tags: ${{ inputs.tags }}
 
       - name: "Debug Version Tags"
         continue-on-error: true
@@ -50,7 +51,7 @@ jobs:
 
       - name: "Generate Docker Tags"
         id: tags
-        uses: smashedr/docker-tags-action@v1
+        uses: cssnr/docker-tags-action@v1
         with:
           images: "ghcr.io/${{ github.repository }}"
           tags: ${{ steps.version.outputs.tags }}
@@ -73,7 +74,7 @@ jobs:
           labels: ${{ steps.tags.outputs.labels }}
           annotations: ${{ steps.tags.outputs.annotations }}
           build-args: |
-            NGINX_VERSION=${{ github.ref_name }}
+            VERSION=${{ github.ref_name }}
 
       - name: "Send Failure Notification"
         if: ${{ failure() }}

.github/workflows/lint.yaml

@@ -2,9 +2,9 @@ name: "Lint"
 
 on:
   workflow_dispatch:
-  pull_request:
   push:
     branches: [master]
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

README.md

@@ -1,6 +1,8 @@
-[![Image Size](https://badges.cssnr.com/ghcr/size/cssnr/docker-nginx-proxy)](https://github.com/cssnr/docker-nginx-proxy/pkgs/container/node-badges)
-[![Image Latest](https://badges.cssnr.com/ghcr/tags/cssnr/docker-nginx-proxy/latest)](https://github.com/cssnr/docker-nginx-proxy/pkgs/container/node-badges)
+[![Image Size](https://badges.cssnr.com/ghcr/size/cssnr/docker-nginx-proxy)](https://github.com/cssnr/docker-nginx-proxy/pkgs/container/docker-nginx-proxy)
+[![Image Latest](https://badges.cssnr.com/ghcr/tags/cssnr/docker-nginx-proxy/latest)](https://github.com/cssnr/docker-nginx-proxy/pkgs/container/docker-nginx-proxy)
 [![Image Tags](https://badges.cssnr.com/ghcr/tags/cssnr/docker-nginx-proxy)](https://github.com/cssnr/docker-nginx-proxy/pkgs/container/node-badges)
+[![GitHub Tag Major](https://img.shields.io/github/v/tag/cssnr/docker-nginx-proxy?sort=semver&filter=!*.*&logo=git&logoColor=white&labelColor=585858&label=%20)](https://github.com/cssnr/docker-nginx-proxy/tags)
+[![GitHub Tag Minor](https://img.shields.io/github/v/tag/cssnr/docker-nginx-proxy?sort=semver&filter=!*.*.*&logo=git&logoColor=white&labelColor=585858&label=%20)](https://github.com/cssnr/docker-nginx-proxy/releases)
 [![GitHub Release Version](https://img.shields.io/github/v/release/cssnr/docker-nginx-proxy?logo=github)](https://github.com/cssnr/docker-nginx-proxy/releases/latest)
 [![Workflow Build](https://img.shields.io/github/actions/workflow/status/cssnr/docker-nginx-proxy/build.yaml?logo=cachet&label=build)](https://github.com/cssnr/docker-nginx-proxy/actions/workflows/build.yaml)
 [![Workflow Lint](https://img.shields.io/github/actions/workflow/status/cssnr/docker-nginx-proxy/lint.yaml?logo=cachet&label=lint)](https://github.com/cssnr/docker-nginx-proxy/actions/workflows/lint.yaml)
@@ -21,6 +23,20 @@ Docker Nginx Proxy Container.
 
 This works quite well as is...
 
+```yaml
+services:
+  nginx:
+    image: ghcr.io/cssnr/docker-nginx-proxy:latest
+    environment:
+      - SERVICE_NAME=app # name of app container
+      - SERVICE_PORT=8000 # port exposed on app
+    ports:
+      - '${PORT:-80}:80' # Host PORT : Container (must be :80)
+
+  app:
+    image: your-app-image # listens on port 8000
+```
+
 ## Examples
 
 If your app container is called `app` and listens on `3000` this will reverse proxy it to the `PORT` exposed on nginx.
@@ -81,16 +97,17 @@ services:
           cpus: '1.0'
           memory: 64M
       labels:
-        - traefik.enable=true
-        - traefik.docker.network=traefik-public
-        - traefik.constraint-label=traefik-public
-        - traefik.http.routers.node-badges-http.rule=Host(`badges.cssnr.com`)
-        - traefik.http.routers.node-badges-http.entrypoints=http
-        - traefik.http.routers.node-badges-http.middlewares=https-redirect
-        - traefik.http.routers.node-badges-https.rule=Host(`badges.cssnr.com`)
-        - traefik.http.routers.node-badges-https.entrypoints=https
-        - traefik.http.routers.node-badges-https.tls=true
-        - traefik.http.services.node-badges-https.loadbalancer.server.port=80
+        - 'traefik.enable=true'
+        - 'traefik.docker.network=traefik-public'
+        - 'traefik.constraint-label=traefik-public'
+        - 'traefik.http.routers.${STACK_NAME?err}-http.rule=Host(`${TRAEFIK_HOST?err}`)'
+        - 'traefik.http.routers.${STACK_NAME}-http.entrypoints=http'
+        - 'traefik.http.routers.${STACK_NAME}-http.middlewares=https-redirect'
+        - 'traefik.http.routers.${STACK_NAME}-https.rule=Host(`${TRAEFIK_HOST}`)'
+        - 'traefik.http.routers.${STACK_NAME}-https.entrypoints=https'
+        - 'traefik.http.routers.${STACK_NAME}-https.tls=true'
+        - 'traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80'
+        - 'traefik.http.services.${STACK_NAME}.loadbalancer.server.scheme=http'
     healthcheck:
       test: ['CMD-SHELL', 'curl -sf localhost:80/health-check || exit 1']
       interval: 30s
@@ -104,7 +121,7 @@ services:
       - traefik-public
 
   app:
-    image: ghcr.io/smashedr/node-badges:latest
+    image: ghcr.io/smashedr/node-badges:${VERSION:-latest}
     command: 'npm start'
     deploy:
       mode: global

build.sh

@@ -6,39 +6,51 @@ REGISTRY_HOST="ghcr.io"
 REGISTRY_USER="cssnr"
 REGISTRY_REPO="docker-nginx-proxy"
 
+DEFAULT_VERSION="mainline"
+BUILD_CONTEXT="src"
+
+
 if [ -f ".env" ];then
     echo "Sourcing Environment: .env"
+    set -a
     source ".env"
+    set +a
 fi
 
 if [ -z "${VERSION}" ];then
-    if [ -z "${1}" ];then
-        read -rp "Version (latest): " VERSION
-    else
+    if [ -n "${1}" ];then
         VERSION="${1}"
+    else
+        read -rp "Version (${DEFAULT_VERSION}): " VERSION
     fi
 fi
 
-[[ -z "${VERSION}" ]] && VERSION="latest"
+[[ -z "${VERSION}" ]] && VERSION="${DEFAULT_VERSION}"
+
+echo "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}"
+
 
 #if [ -z "${USERNAME}" ];then
 #    read -rp "Username: " USERNAME
 #fi
 #if [ -z "${PASSWORD}" ];then
 #    read -rp "Password: " PASSWORD
 #fi
-
-echo "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}"
-
+#
 #docker login --username "${USERNAME}" --password "${PASSWORD}" "${REGISTRY_HOST}"
 #docker login "${REGISTRY_HOST}"
 
+
 #docker buildx create --use
-#docker buildx build --platform linux/amd64,linux/arm64 \
-#    -t "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}" nginx
+#docker buildx build -t "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}" \
+#    --platform linux/amd64,linux/arm64 \
+#    --build-arg VERSION="${VERSION}" \
+#    "${BUILD_CONTEXT}"
 
-docker build -t "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}" src
+docker build -t "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}" \
+    --build-arg VERSION="${VERSION}" \
+    "${BUILD_CONTEXT}"
 
-#--build-arg NGINX_VERSION="${VERSION}" \
+# --build-arg VERSION="${VERSION}" \
 
 #docker push "${REGISTRY_HOST}/${REGISTRY_USER}/${REGISTRY_REPO}:${VERSION}"

docker-compose.yaml

@@ -4,10 +4,10 @@ services:
   nginx:
     image: ghcr.io/cssnr/docker-nginx-proxy:latest
     environment:
-      - SERVICE_NAME=app
-      - SERVICE_PORT=80
+      - SERVICE_NAME=app # name of app container
+      - SERVICE_PORT=8000 # port exposed on app
     ports:
-      - "80:80"
+      - "${PORT:-80}:80" # Host PORT : Container (must be :80)
 
   app:
-    image: your-app-image
+    image: your-app-image # listens on port 8000

src/Dockerfile

@@ -1,14 +1,17 @@
-ARG NGINX_VERSION=1
-FROM nginx:${NGINX_VERSION}-alpine-slim
+ARG VERSION=1
+FROM nginx:${VERSION}-alpine-slim
+
+ARG VERSION
+
+ENV TZ=UTC
 
 LABEL org.opencontainers.image.source="https://github.com/cssnr/docker-nginx-proxy"
 LABEL org.opencontainers.image.description="Docker Nginx Proxy"
 LABEL org.opencontainers.image.authors="smashedr"
-
-ENV TZ=UTC
+LABEL org.opencontainers.image.version="${VERSION}"
 
 RUN apk add --no-cache curl
 
-COPY nginx.conf /etc/nginx/nginx.conf
-
 COPY --chmod=0755 10-update-config.sh /docker-entrypoint.d
+
+COPY nginx.conf /etc/nginx/nginx.conf