v1.1 - Update services and pipeline

.github/workflows/main.yml

@@ -16,47 +16,47 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: usableprivacy
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build cryptodns
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./cryptodns
           file: ./cryptodns/Dockerfile
-          platforms: linux/amd64, linux/arm
+          platforms: linux/amd64
           push: true
           tags: |
             ghcr.io/usableprivacy/dns/cryptodns:latest
       -
         name: Build letsencrypt
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./letsencrypt
           file: ./letsencrypt/Dockerfile
-          platforms: linux/amd64, linux/arm
+          platforms: linux/amd64
           push: true
           tags: |
             ghcr.io/usableprivacy/dns/letsencrypt:latest
       -
         name: Build recursor
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./recursor
           file: ./recursor/Dockerfile
-          platforms: linux/amd64, linux/arm
+          platforms: linux/amd64
           push: true
           tags: |
             ghcr.io/usableprivacy/dns/recursor:latest

README.md

@@ -13,7 +13,7 @@ Basic requirements:
 * [docker](https://github.com/docker/docker-ce)
 * [docker-compose](https://github.com/docker/compose)
 ## Setup
-1) Fetch the latest **updns** source code from Github
+1) Fetch the latest **updns** source code from GitHub
     ```
     git clone https://github.com/usableprivacy/updns.git
     ```
@@ -26,7 +26,7 @@ Basic requirements:
    docker-compose up
    ```
 
-## Basic updns building blocks
+## Basic `updns` building blocks
 * [docker-compose.yml](docker-compose.yml) deploys ad-blocking DoH + DoT servers.
 * Basic **updns** Services
     * [cryptodns](cryptodns) deploys `dnsdist` in Docker with DoH and DoT endpoints.

cryptodns/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:12-slim
 
-RUN apt-get update && apt-get install curl gnupg -y
-RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add -
+RUN apt-get update && apt-get install curl -y
+RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | tee /etc/apt/keyrings/dnsdist-18-pub.asc
 COPY conf/pdns.list /etc/apt/sources.list.d/pdns.list
 COPY conf/pdns.pin /etc/apt/preferences.d/pdns
 

cryptodns/conf/pdns.list

@@ -1 +1 @@
-deb [arch=amd64] http://repo.powerdns.com/debian bookworm-dnsdist-18 main
+deb [signed-by=/etc/apt/keyrings/dnsdist-18-pub.asc] http://repo.powerdns.com/debian bookworm-dnsdist-18 main

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   cryptodns:
     build: cryptodns

recursor/Dockerfile

@@ -1,8 +1,7 @@
-FROM debian:bullseye-slim
+FROM debian:12-slim
 
-
-RUN apt-get update && apt-get install curl gnupg -y
-RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add -
+RUN apt-get update && apt-get install curl -y
+RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | tee tee /etc/apt/keyrings/rec-4-pub.asc
 COPY conf/pdns.list /etc/apt/sources.list.d/pdns.list
 COPY conf/pdns.pin /etc/apt/preferences.d/pdns
 

recursor/conf/pdns.list

@@ -1 +1 @@
-deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-47 main
+deb [signed-by=/etc/apt/keyrings/rec-4-pub.asc] http://repo.powerdns.com/debian bookworm-rec-49 main