Merge pull request #1179 from radian-software/rr-docker-ratelimits

Resolve Docker Hub rate limits

Author: raxod502

.github/workflows/ci.yml

@@ -10,12 +10,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        emacs_version: [25, 26, 27, 28]
+        emacs_version: [25, 26, 27, 28, 29]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: GHCR login
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: CI
         env:
           VERSION: ${{ matrix.emacs_version }}
         run: >-
-          make docker CMD="make -k compile checkdoc longlines test smoke"
+          make docker
+          CMD="make -k compile checkdoc longlines test smoke"
+          DOCKER_BASE=ghcr.io/radian-software/emacs-base
+          NO_SUDO_DOCKER=1

Dockerfile

@@ -1,5 +1,6 @@
-ARG VERSION
-FROM silex/emacs:$VERSION
+ARG BASE=silex/emacs
+ARG VERSION=29
+FROM $BASE:$VERSION
 
 ARG UID
 

scripts/docker.bash

@@ -3,15 +3,16 @@
 set -e
 set -o pipefail
 
-tag="${1:-latest}"
+tag="${1:-29}"
 
 args=(bash)
 if [[ -n "$2" ]]; then
     args=("${args[@]}" -c "$2")
 fi
 
 docker() {
-    if [[ "$OSTYPE" != darwin* ]] && [[ "$EUID" != 0 ]]; then
+    if [[ "$OSTYPE" != darwin* ]] && [[ "$EUID" != 0 ]] \
+    && [[ -z "${NO_SUDO_DOCKER:-}" ]]; then
         command sudo docker "$@"
     else
         command docker "$@"
@@ -20,7 +21,8 @@ docker() {
 
 docker build . -t "straight.el:$tag" \
        --build-arg "UID=$UID"        \
-       --build-arg "VERSION=$tag"
+       --build-arg "VERSION=$tag"    \
+       --build-arg "BASE=${DOCKER_BASE:-silex/emacs}"
 
 it=()