Skip to content
Snippets Groups Projects
Commit 24db359b authored by Michal Zander's avatar Michal Zander Committed by Bartek Wrona
Browse files

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!98Add pattern tests for REST API
.git/modules/ git/modules
.vscode/ .vscode/
docker/blockchain/ docker/blockchain/
docker/ci/ docker/ci/
......
# 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
......
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
......
...@@ -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"
] ]
......
# 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 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment