DOPS-243: Fix images (#16296)
DOPS-243: Fix images (#16296) Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
221f70a6cb
Коммит
a5e2275b16
@@ -22,7 +22,7 @@ empty:
|
||||
- echo "empty"
|
||||
|
||||
#lint:
|
||||
# image: golangci/golangci-lint:v1.31.0
|
||||
# image: $CI_REGISTRY/mattermost/ci/images/golangci-lint:v1.31.0-1
|
||||
# stage: .pre
|
||||
# script:
|
||||
# - GO111MODULE=off GOBIN=$PWD/bin go get -u github.com/mattermost/mattermost-govet
|
||||
@@ -33,7 +33,7 @@ empty:
|
||||
# - if: '$ONLY_BUILD != "yes"'
|
||||
#
|
||||
#layers:
|
||||
# image: mattermost/mattermost-build-server:20201023_golang-1.14.6
|
||||
# image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201023_golang-1.14.6
|
||||
# stage: .pre
|
||||
# script:
|
||||
# - make store-layers
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
.test-schema:
|
||||
stage: test
|
||||
image: mattermost/mattermost-build-docker:20201023_19.03.12
|
||||
image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.12-1
|
||||
services:
|
||||
- name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.12-1
|
||||
alias: docker
|
||||
variables:
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_CONTENT_TRUST: 0
|
||||
DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ""
|
||||
services:
|
||||
- name: docker:19.03.12-dind
|
||||
alias: dind
|
||||
before_script:
|
||||
- docker ps
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
.test:
|
||||
stage: test
|
||||
image: mattermost/mattermost-build-docker:20201023_19.03.12
|
||||
image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.12-1
|
||||
services:
|
||||
- name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.12-1
|
||||
alias: docker
|
||||
variables:
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
@@ -10,9 +13,6 @@
|
||||
|
||||
MM_SQLSETTINGS_DATASOURCE: "postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10"
|
||||
MM_SQLSETTINGS_DRIVERNAME: postgres
|
||||
services:
|
||||
- name: docker:19.03.12-dind
|
||||
alias: dind
|
||||
script:
|
||||
- mkdir -p client/plugins
|
||||
- mkdir -p build/test-results
|
||||
|
||||
Ссылка в новой задаче
Block a user