Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
haf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hive
haf
Commits
5ed43e64
Commit
5ed43e64
authored
2 weeks ago
by
Dan Notestein
Committed by
Bartek Wrona
5 days ago
Browse files
Options
Downloads
Patches
Plain Diff
Update docker images to use the latest PostgreSQL 17.4
parent
e6803dce
No related branches found
No related tags found
1 merge request
!632
Update docker images to ubuntu 24.04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
Dockerfile
+3
-3
3 additions, 3 deletions
Dockerfile
scripts/ci-helpers/build_ci_base_image.sh
+1
-1
1 addition, 1 deletion
scripts/ci-helpers/build_ci_base_image.sh
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
2
−
2
View file @
5ed43e64
...
@@ -14,8 +14,8 @@ variables:
...
@@ -14,8 +14,8 @@ variables:
GIT_SUBMODULE_STRATEGY
:
recursive
GIT_SUBMODULE_STRATEGY
:
recursive
FF_ENABLE_JOB_CLEANUP
:
1
FF_ENABLE_JOB_CLEANUP
:
1
GIT_STRATEGY
:
clone
GIT_STRATEGY
:
clone
# uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-1
7
# uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-1
8
BUILDER_IMAGE_TAG
:
"
@sha256:
234d3592e53d4cd7cc6df8e61366e8cbe69ac439355475c34fb2b0daf40e7a26
"
BUILDER_IMAGE_TAG
:
"
@sha256:
3f3198e1db9e438ccfa1a559f7529a173129b74e74ae35e1c189f8820361c397
"
CI_DEBUG_SERVICES
:
"
true"
CI_DEBUG_SERVICES
:
"
true"
SETUP_SCRIPTS_PATH
:
"
$CI_PROJECT_DIR/scripts"
SETUP_SCRIPTS_PATH
:
"
$CI_PROJECT_DIR/scripts"
TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT
:
60
TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT
:
60
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
3
View file @
5ed43e64
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# docker buildx build --progress=plain --target=ci-base-image --tag registry.gitlab.syncad.com/hive/haf/ci-base-image$CI_IMAGE_TAG --file Dockerfile .
# docker buildx build --progress=plain --target=ci-base-image --tag registry.gitlab.syncad.com/hive/haf/ci-base-image$CI_IMAGE_TAG --file Dockerfile .
# To be started from cloned haf source directory.
# To be started from cloned haf source directory.
ARG
CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/
ARG
CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/
ARG
CI_IMAGE_TAG=ubuntu22.04-1
7
ARG
CI_IMAGE_TAG=ubuntu22.04-1
8
ARG
BUILD_IMAGE_TAG
ARG
BUILD_IMAGE_TAG
ARG
IMAGE_TAG_PREFIX
ARG
IMAGE_TAG_PREFIX
...
@@ -208,9 +208,9 @@ EXPOSE ${WS_PORT}
...
@@ -208,9 +208,9 @@ EXPOSE ${WS_PORT}
# JSON rpc service
# JSON rpc service
EXPOSE
${HTTP_PORT}
EXPOSE
${HTTP_PORT}
FROM
registry.gitlab.syncad.com/hive/haf/minimal-runtime:ubuntu22.04-1
6
AS
minimal-instance
FROM
registry.gitlab.syncad.com/hive/haf/minimal-runtime:ubuntu22.04-1
8
AS
minimal-instance
ENV
BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG:-:ubuntu22.04-8}
ENV
BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG:-:ubuntu22.04-
1
8}
ARG
P2P_PORT=2001
ARG
P2P_PORT=2001
ENV
P2P_PORT=${P2P_PORT}
ENV
P2P_PORT=${P2P_PORT}
...
...
This diff is collapsed.
Click to expand it.
scripts/ci-helpers/build_ci_base_image.sh
+
1
−
1
View file @
5ed43e64
#! /bin/bash
#! /bin/bash
REGISTRY
=
${
1
:-
registry
.gitlab.syncad.com/hive/haf/
}
REGISTRY
=
${
1
:-
registry
.gitlab.syncad.com/hive/haf/
}
CI_IMAGE_TAG
=
ubuntu22.04-1
7
CI_IMAGE_TAG
=
ubuntu22.04-1
8
# exit when any command fails
# exit when any command fails
set
-e
set
-e
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment