signald/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix x86 build

Browse source
This commit is contained in:
finn 2020-12-14 11:34:40 -08:00
parent d7d400c6e6
commit f08da18815
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -1,5 +1,11 @@
variables:
DOCKER_TLS_CERTDIR: "/certs"
services:
- docker:20.10.0-dind
.build: &build .build: &build
image: docker:latest image: docker:20.10.0
stage: build stage: build
script: script:
- docker login -u gitlab-ci-token -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}" - docker login -u gitlab-ci-token -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}"
@ -10,7 +16,7 @@
- if [[ "${CI_COMMIT_REF_SLUG}" == "main" ]]; then docker tag "${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG}" "${CI_REGISTRY_IMAGE}/${NAME}:latest" && docker push "${CI_REGISTRY_IMAGE}/${NAME}:latest"; fi - if [[ "${CI_COMMIT_REF_SLUG}" == "main" ]]; then docker tag "${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG}" "${CI_REGISTRY_IMAGE}/${NAME}:latest" && docker push "${CI_REGISTRY_IMAGE}/${NAME}:latest"; fi
signal-server: signal-server:
image: docker:latest image: docker:20.10.0
stage: build stage: build
script: script:
- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
@ -24,11 +30,11 @@ signal-server:
- echo "docker pull ${CI_REGISTRY_IMAGE}/signal-server:${VERSION}" - echo "docker pull ${CI_REGISTRY_IMAGE}/signal-server:${VERSION}"
allow_failure: true allow_failure: true
testhelper: test-helper:
<<: *build <<: *build
variables: variables:
DOCKERFILE: "testhelper.Dockerfile" DOCKERFILE: "test-helper.Dockerfile"
NAME: "testhelper" NAME: "test-helper"
allow_failure: true allow_failure: true
builder-image:aarch64: builder-image:aarch64: