forked from
tangled.org/knot-docker
Docker config for @recaptime.dev's Knot server on Hack Club Nest.
knot.hackclub.community
ci(gitlab-ci): tweak builder and deploy container images on both CI and build scripts
That's where the mismatch happens, also to keep in sync with the Dockerfile,
per commit d8944812e366741747b37289404a8fc6825e70bf.
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@crew.recaptime.dev>
+5
-3
+1
-1
.gitlab-ci.yml
+1
-1
.gitlab-ci.yml
···
49
49
GID: "2897"
50
50
# build args-based base images to use Dependency Proxy on CI
51
51
DEPLOY_IMAGE: "$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/alpine:edge"
52
-
BUILDER_IMAGE: "$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/golang:1.24-alpine"
52
+
BUILDER_IMAGE: "$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/golang:1.26-alpine"
53
53
# enable buildkit
54
54
DOCKER_BUILDKIT: "1"
55
55
# env vars for build/ci-publish-builds
+4
-2
bin/build
+4
-2
bin/build
···
14
14
BRANCH_NAME_SLUG=${CI_COMMIT_REF_SLUG:-$_BRANCH_NAME_SLUG_LOCAL}
15
15
IMAGE_NAME=${IMAGE_NAME:-"$CI_REGISTRY/$CI_PROJECT_PATH"}
16
16
KNOT_REPO_URL=${1:-"https://tangled.org/tangled.org/core"}
17
-
KNOT_RELEASE_TAG=${2:-"v1.11.0-alpha"}
17
+
KNOT_RELEASE_TAG=${2:-"master"} # build from dev branch if release tag left blank
18
18
BUILD_TYPE=${BUILD_TYPE:-"production"}
19
19
DOCKER_BUILD_REPO=${DOCKER_BUILD_REPO:-"https://tangled.org/recaptime.dev/knot-docker-nest"}
20
+
DEPLOY_IMAGE=${DEPLOY_IMAGE:-"alpine:edge"}
21
+
BUILDER_IMAGE=${BUILDER_IMAGE:-"golang:1.26-alpine"}
20
22
21
23
echo "Attempting to build $IMAGE_NAME:build-$TIMESTAMP for $BUILD_TYPE"
22
24
DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} docker build \
23
25
-t "$IMAGE_NAME:build-$TIMESTAMP" \
24
26
--build-arg TAG=$KNOT_RELEASE_TAG \
25
-
--build-arg REPO_URL=$KNOT_REPO_URL \
27
+
--build-arg KNOT_REPO_URL=$KNOT_REPO_URL \
26
28
--build-arg DOCKER_BUILD_REPO=$DOCKER_BUILD_REPO \
27
29
--build-arg DOCKER_BUILD_COMMIT=$COMMIT_SHA \
28
30
--build-arg UID=$UID \