Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reputation_tracker
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
reputation_tracker
Commits
24db359b
Commit
24db359b
authored
1 week ago
by
Michal Zander
Committed by
Bartek Wrona
1 week ago
Browse files
Options
Downloads
Patches
Plain Diff
docker syntax image reference points to ccc repository instead of dockerhub directly
parent
9bd85c52
No related branches found
No related tags found
1 merge request
!98
Add pattern tests for REST API
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.dockerignore
+1
-1
1 addition, 1 deletion
.dockerignore
Dockerfile
+4
-3
4 additions, 3 deletions
Dockerfile
Dockerfile.rewriter
+1
-2
1 addition, 2 deletions
Dockerfile.rewriter
docker-bake.hcl
+4
-21
4 additions, 21 deletions
docker-bake.hcl
docker/ci/Dockerfile
+1
-3
1 addition, 3 deletions
docker/ci/Dockerfile
with
11 additions
and
30 deletions
.dockerignore
+
1
−
1
View file @
24db359b
.
git/modules
/
git/modules
.vscode/
.vscode/
docker/blockchain/
docker/blockchain/
docker/ci/
docker/ci/
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
4
−
3
View file @
24db359b
# syntax=registry.gitlab.syncad.com/hive/common-ci-configuration/dockerfile:1.5
ARG
PSQL_CLIENT_VERSION=14-1
ARG
PSQL_CLIENT_VERSION=14-1
FROM
registry.gitlab.syncad.com/hive/common-ci-configuration/psql:${PSQL_CLIENT_VERSION}
AS
psql
_client
FROM
registry.gitlab.syncad.com/hive/common-ci-configuration/psql:${PSQL_CLIENT_VERSION}
AS
psql
FROM
psql
_client
as
version-calculcation
FROM
psql
as
version-calculcation
COPY
--chown=haf_admin:users . /home/haf_admin/src
COPY
--chown=haf_admin:users . /home/haf_admin/src
WORKDIR
/home/haf_admin/src
WORKDIR
/home/haf_admin/src
RUN
scripts/generate_version_sql.sh
$(
pwd
)
RUN
scripts/generate_version_sql.sh
$(
pwd
)
FROM
psql
_client
AS
full
FROM
psql
AS
full
ARG
BUILD_TIME
ARG
BUILD_TIME
ARG
GIT_COMMIT_SHA
ARG
GIT_COMMIT_SHA
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.rewriter
+
1
−
2
View file @
24db359b
FROM openresty/openresty:alpine AS without_tag
FROM registry.gitlab.syncad.com/hive/common-ci-configuration/nginx:ecd325dd43aee24562f59195ef51a20fa15514d4 AS without_tag
COPY docker/reputation_tracker_nginx.conf.template /usr/local/openresty/nginx/conf/nginx.conf.template
COPY docker/reputation_tracker_nginx.conf.template /usr/local/openresty/nginx/conf/nginx.conf.template
COPY rewrite_rules.conf /usr/local/openresty/nginx/conf/rewrite_rules.conf
COPY rewrite_rules.conf /usr/local/openresty/nginx/conf/rewrite_rules.conf
COPY docker/rewriter_entrypoint.sh /entrypoint.sh
COPY docker/rewriter_entrypoint.sh /entrypoint.sh
...
...
This diff is collapsed.
Click to expand it.
docker-bake.hcl
+
4
−
21
View file @
24db359b
...
@@ -56,31 +56,11 @@ group "default" {
...
@@ -56,31 +56,11 @@ group "default" {
}
}
# Targets
# Targets
target
"psql-client"
{
dockerfile
=
"Dockerfile"
target
=
"psql_client"
tags
=
[
"${registry-name("
psql-client
", "")}:${PSQL_CLIENT_VERSION}"
]
platforms
=
[
"linux/amd64"
]
output
=
[
"type=docker"
]
}
target
"psql-client-ci"
{
inherits
=
[
"psql-client"
]
output
=
[
"type=registry"
]
}
## Locally tag image with "$TAG",
## Locally tag image with "$TAG",
## which is "latest" by default
## which is "latest" by default
target
"full"
{
target
"full"
{
inherits
=
[
"psql-client"
]
dockerfile
=
"Dockerfile"
target
=
"full"
target
=
"full"
tags
=
[
tags
=
[
"${CI_REGISTRY_IMAGE}:${TAG}"
"${CI_REGISTRY_IMAGE}:${TAG}"
...
@@ -93,6 +73,9 @@ target "full" {
...
@@ -93,6 +73,9 @@ target "full" {
GIT_LAST_COMMITTER
=
"${GIT_LAST_COMMITTER}"
,
GIT_LAST_COMMITTER
=
"${GIT_LAST_COMMITTER}"
,
GIT_LAST_COMMIT_DATE
=
"${GIT_LAST_COMMIT_DATE}"
,
GIT_LAST_COMMIT_DATE
=
"${GIT_LAST_COMMIT_DATE}"
,
}
}
platforms
=
[
"linux/amd64"
]
output
=
[
output
=
[
"type=docker"
"type=docker"
]
]
...
...
This diff is collapsed.
Click to expand it.
docker/ci/Dockerfile
+
1
−
3
View file @
24db359b
# syntax=docker/dockerfile:1.5
# syntax=registry.gitlab.syncad.com/hive/common-ci-configuration/dockerfile:1.5
# When updating docker-builder and benchmark-test-runner use the images built from latest develop commit
# from repository registry.gitlab.syncad.com/hive/common-ci-configuration
FROM
registry.gitlab.syncad.com/hive/common-ci-configuration/docker-builder:7ea99b10bbf0f9b1fbb88f52a78ead4c82f15d75
FROM
registry.gitlab.syncad.com/hive/common-ci-configuration/docker-builder:7ea99b10bbf0f9b1fbb88f52a78ead4c82f15d75
COPY
--from=registry.gitlab.syncad.com/hive/common-ci-configuration/benchmark-test-runner:7ea99b10bbf0f9b1fbb88f52a78ead4c82f15d75 \
COPY
--from=registry.gitlab.syncad.com/hive/common-ci-configuration/benchmark-test-runner:7ea99b10bbf0f9b1fbb88f52a78ead4c82f15d75 \
...
...
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