fixes
This commit is contained in:
@@ -7,7 +7,6 @@ variables:
|
|||||||
DOCKER_REGISTRY: "registry.beaconborn.ru"
|
DOCKER_REGISTRY: "registry.beaconborn.ru"
|
||||||
DOCKER_IMAGE: "$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME"
|
DOCKER_IMAGE: "$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME"
|
||||||
DOCKER_TAG: "latest"
|
DOCKER_TAG: "latest"
|
||||||
DOCKER_HOST: "tcp://localhost:2375"
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
stage: test
|
stage: test
|
||||||
@@ -18,20 +17,18 @@ test:
|
|||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
|
|
||||||
image: docker:latest
|
image: docker:latest
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:dind
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- apk add --no-cache docker-cli
|
- apk add --no-cache docker-cli
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $DOCKER_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $DOCKER_REGISTRY
|
||||||
|
|
||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
|
variables:
|
||||||
|
DOCKER_HOST: "unix:///var/run/docker.sock" # Используем локальный сокет Docker
|
||||||
script:
|
script:
|
||||||
- docker build -t $DOCKER_REGISTRY/$DOCKER_IMAGE:$DOCKER_TAG .
|
- docker build -t $DOCKER_REGISTRY/$DOCKER_IMAGE:$DOCKER_TAG .
|
||||||
- docker push $DOCKER_REGISTRY/$DOCKER_IMAGE:$DOCKER_TAG
|
- docker push $DOCKER_REGISTRY/$DOCKER_IMAGE:$DOCKER_TAG
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
|
|||||||
Reference in New Issue
Block a user