feat: Add Debian based image (#81)

Author: joshuaavalon

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
           cache-dependency-path: package-lock.json
       - run: npm ci
       - run: npm run lint
-  docker:
+  docker-alpine:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -54,6 +54,37 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+  docker-debian:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/metadata-action@v4
+        id: meta
+        with:
+          images: ghcr.io/joshuaavalon/cloudflare-ddns
+          tags: |
+            type=sha
+            type=ref,event=branch
+          flavor: |
+            suffix=-debian,onlatest=true
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        if: github.event_name != 'pull_request'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v4
+        with:
+          file: Dockerfile.debian
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
   release-please:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'

.github/workflows/tag.yml

@@ -7,7 +7,7 @@ on:
   schedule:
     - cron: "0 0 * * *"
 jobs:
-  docker:
+  docker-alpine:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -33,9 +33,44 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v4
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+  docker-debian:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/metadata-action@v4
+        id: meta
+        with:
+          images: ghcr.io/joshuaavalon/cloudflare-ddns
+          tags: |
+            type=schedule
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+            type=ref,event=branch
+          flavor: |
+            suffix=-debian,onlatest=true
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        if: github.event_name != 'pull_request'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v4
+        with:
+          file: Dockerfile.debian
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7

Dockerfile

@@ -13,6 +13,7 @@ RUN npm ci && \
 
 RUN mkdir /packages && \
     cp --parents -r packages/*/lib / && \
+
     cp --parents packages/*/package.json /
 
 FROM $BASE_IMAGE
@@ -24,6 +25,7 @@ ENV CF_DNS__CONFIG=/app/config.yaml
 ENV NODE_ENV=production
 ENV CF_DNS__CRON='*/5 * * * *'
 ENV NPM_CONFIG_UPDATE_NOTIFIER=false
+ENV NPM_CONFIG_LOGLEVEL=warn
 
 COPY --from=builder /packages /app/packages/
 COPY package.json package-lock.json index.mjs /app/

Dockerfile.debian

@@ -0,0 +1,53 @@
+ARG BASE_IMAGE=node:18-slim
+
+FROM $BASE_IMAGE as builder
+
+WORKDIR /app
+
+COPY packages /app/packages/
+COPY package.json tsconfig.json package-lock.json /app/
+
+RUN npm ci && \
+    npm run build && \
+    rm -rf packages/*/lib/__tests__
+
+RUN mkdir /packages && \
+    cp --parents -r packages/*/lib / && \
+    cp --parents packages/*/package.json /
+
+FROM $BASE_IMAGE
+
+WORKDIR /app
+
+ENV NPM_CONFIG_PREFIX=/app/.npm
+ENV CF_DNS__CONFIG=/app/config.yaml
+ENV NODE_ENV=production
+ENV CF_DNS__CRON='*/5 * * * *'
+ENV NPM_CONFIG_UPDATE_NOTIFIER=false
+ENV NPM_CONFIG_LOGLEVEL=warn
+
+COPY --from=builder /packages /app/packages/
+COPY package.json package-lock.json index.mjs /app/
+COPY docker/root/ /
+
+RUN chmod +x /app/cloudflare.sh /app/start.sh
+
+RUN apt-get update && apt-get install -y cron
+
+SHELL ["/bin/bash", "-c"]
+
+RUN npm ci
+
+ENV ZONE=
+ENV HOST=
+ENV EMAIL=
+ENV API=
+ENV TTL=
+ENV PROXY=
+ENV DEBUG=
+ENV FORCE_CREATE=
+ENV RUNONCE=
+ENV IPV6=
+
+ENTRYPOINT ["/app/start.sh"]
+CMD []

docker/root/app/cloudflare.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-cd /app
+cd /app;
 
 if [ "$CF_DNS__LOG_TYPE" == "json" ]; then
-  npm run --cache /home/node/.npm start:json;
+  su node -c "npm run --cache /home/node/.npm start:json";
 else
-  npm run --cache /home/node/.npm start:pretty;
+  su node -c "npm run --cache /home/node/.npm start:pretty";
 fi

docker/root/app/start.sh

@@ -18,7 +18,7 @@ else
 ";
 fi
 
-chown node:node /app
+chown node:node /app;
 
 if [ "$CF_DNS__LOG_TYPE" == "json" ]; then
   msg='{"level":30,"time":';
@@ -35,9 +35,15 @@ else
   echo "Setting crontab to ${CF_DNS__CRON}";
 fi
 
-# Delete last line
-sed -i '$ d' /etc/crontabs/root
-echo -e "${CF_DNS__CRON} /app/cloudflare.sh" >> /etc/crontabs/root
-chmod 600 /etc/crontabs/root
-
-crond -f
+if [ -f /etc/debian_version ]; then
+  printenv > /etc/environment;
+  echo -e "${CF_DNS__CRON} root /app/cloudflare.sh > /proc/1/fd/1 2>&1" > /etc/cron.d/cloudflare-ddns;
+  chmod 600 /etc/cron.d/cloudflare-ddns;
+  cron -f;
+else
+  # Delete last line
+  sed -i '$ d' /etc/crontabs/root;
+  echo -e "${CF_DNS__CRON} /app/cloudflare.sh" >> /etc/crontabs/root;
+  chmod 600 /etc/crontabs/root;
+  crond -f;
+fi

docker/root/etc/crontabs/root

@@ -65,10 +65,9 @@ const updateDnsRecords = async (ctx: Context): Promise<void> => {
 };
 
 const printConfig = (ctx: Context): void => {
-  const { config, logger } = ctx;
-  const cloneConfig = omit(config, ["auth"]);
-  const configStr = JSON.stringify(cloneConfig, null, 2);
-  logger.debug(`Running with the following configuration:\n${configStr}`);
+  const { logger } = ctx;
+  const config = omit(ctx.config, ["auth"]);
+  logger.debug("Running with the following configuration", { config });
 };
 
 const registerParsers = (config: Config): void => {