Merge !1635: v5.x: ci: docker: specify platform explicitly

CZ-NIC · Nov 19, 2024 · 8d851d2 · 8d851d2
2 parents 156b222 + 1715fb5
commit 8d851d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -205,7 +205,7 @@ build:macOS:
     DOCKER_HUB_REGISTRY: cznic/knot-resolver
     GITLAB_REGISTRY: ${CI_REGISTRY}/knot/knot-resolver/cross-platform
   tags:
-    - docker
+    - amd64
     - dind
 
 docker:build:

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Intermediate container for Knot DNS build (not persistent)
 # SPDX-License-Identifier: GPL-3.0-or-later
-FROM debian:11 AS knot-dns-build
-ARG KNOT_DNS_VERSION=v3.1.1
+FROM debian:12 AS knot-dns-build
+ARG KNOT_DNS_VERSION=v3.2.9
 
 # Build dependencies
 ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \
@@ -31,7 +31,7 @@ RUN mkdir -p /tmp/root/usr/local/include /tmp/root/usr/local/lib /tmp/root/usr/l
 
 
 # Intermediate container with runtime dependencies
-FROM debian:11-slim AS runtime
+FROM debian:12-slim AS runtime
 
 # Install runtime dependencies
 ENV KNOT_DNS_RUNTIME_DEPS libgnutls30
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,7 +205,7 @@ build:macOS: @@
         DOCKER_HUB_REGISTRY: cznic/knot-resolver
         GITLAB_REGISTRY: ${CI_REGISTRY}/knot/knot-resolver/cross-platform
       tags:
-        - docker
+        - amd64
         - dind
     docker:build:
@@ Expand Down @@