Skip to content
Snippets Groups Projects
Unverified Commit 17db2199 authored by jooola's avatar jooola
Browse files

ci: keep job variables in the build job definition

parent 5480ea2e
No related branches found
No related tags found
1 merge request!59ci: improve pipeline
...@@ -20,9 +20,6 @@ stages: ...@@ -20,9 +20,6 @@ stages:
variables: variables:
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
POSTGRES_DB: funkwhale_network POSTGRES_DB: funkwhale_network
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
pre-commit: pre-commit:
extends: [.pre-commit] extends: [.pre-commit]
...@@ -51,12 +48,17 @@ pre-commit: ...@@ -51,12 +48,17 @@ pre-commit:
# path: coverage.xml # path: coverage.xml
build: build:
only:
- main
stage: build stage: build
image: egon0/docker-with-buildx-and-git:bash rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tags: tags:
- dind - dind
image: egon0/docker-with-buildx-and-git:bash
variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
services: services:
- docker:20-dind - docker:20-dind
before_script: before_script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment