diff --git a/Dockerfile b/Dockerfile index 79eec9d..e3f9237 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -ARG BUILDER_IMAGE=golang:1.25-alpine +ARG BUILDER_IMAGE=golang:1.26-alpine ARG DEPLOY_IMAGE=alpine:edge FROM ${BUILDER_IMAGE} as builder ENV KNOT_REPO_SCAN_PATH=/home/git/repositories ENV CGO_ENABLED=1 GOSUMDB=off GOPROXY=direct -ARG KNOT_RELEASE_TAG='v1.13.0-alpha' KNOT_REPO_URL=https://tangled.org/@tangled.org/core +ARG KNOT_RELEASE_TAG='v1.14.1-alpha' KNOT_REPO_URL=https://tangled.org/@tangled.org/core WORKDIR /app RUN apk add git gcc musl-dev diff --git a/bin/build b/bin/build index 3de76f0..723fc8f 100755 --- a/bin/build +++ b/bin/build @@ -23,7 +23,7 @@ BUILDER_IMAGE=${BUILDER_IMAGE:-"golang:1.26-alpine"} echo "Attempting to build $IMAGE_NAME:build-$TIMESTAMP for $BUILD_TYPE" DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} docker build \ -t "$IMAGE_NAME:build-$TIMESTAMP" \ - --build-arg TAG=$KNOT_RELEASE_TAG \ + --build-arg KNOT_RELEASE_TAG=$KNOT_RELEASE_TAG \ --build-arg KNOT_REPO_URL=$KNOT_REPO_URL \ --build-arg DOCKER_BUILD_REPO=$DOCKER_BUILD_REPO \ --build-arg DOCKER_BUILD_COMMIT=$COMMIT_SHA \ diff --git a/rootfs/bin/knotserver-version b/rootfs/bin/knotserver-version index 98e9043..9402573 100755 --- a/rootfs/bin/knotserver-version +++ b/rootfs/bin/knotserver-version @@ -6,7 +6,7 @@ TANGLED_REPO_URL=${TANGLED_REPO_URL:-"https://tangled.org/tangled.org/core"} TANGLED_BUILD_COMMIT=$(cat /opt/knotserver-commit-sha 2>/dev/null || echo "unknown") DOCKER_BUILD_COMMIT=$DOCKER_BUILD_COMMIT -DOCKER_BUILD_REPO=${DOCKER_BUILD_REPO:-"https://tangled.org/recaptime.dev/knot-docker-nest"} +DOCKER_BUILD_REPO=${DOCKER_BUILD_REPO:-"https://tangled.org/recaptime.dev/tangled-knotserver-docker"} echo "Tangled build commit SHA: $TANGLED_BUILD_COMMIT" echo "Tangled commit link: $TANGLED_REPO_URL/commit/$TANGLED_BUILD_COMMIT" diff --git a/rootfs/etc/archived/.keep b/rootfs/etc/archived/.keep new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/ssh/sshd_config.d/authorized_keys_command.conf b/rootfs/etc/archived/authorized_keys_command.conf similarity index 100% rename from rootfs/etc/ssh/sshd_config.d/authorized_keys_command.conf rename to rootfs/etc/archived/authorized_keys_command.conf