Updated ca certs, gitlab-ci

This commit is contained in:
Deon George 2018-03-05 00:03:11 +11:00
parent 015bd81d90
commit eb671cd91e
3 changed files with 83 additions and 9 deletions

View File

@ -1 +1,2 @@
.git/
image*bz2

View File

@ -6,24 +6,23 @@ stages:
variables:
VERSION: dind
DOCKER_IMAGE: leenooks/ci-docker
DOCKER_REGISTRY: registry.leenooks.net
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
CACHETAG: build
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
services:
- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
- ${CI_REGISTRY}/leenooks/ci-docker:dind
before_script:
- docker info
- docker version
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
test:
stage: test
script:
- cat /etc/hosts
- env|sort
- docker build -t ${DOCKER_IMAGE}:${VERSION} .
- docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
- docker images
only:
- debug
@ -31,9 +30,11 @@ test:
build:
stage: build
script:
- docker build -t ${DOCKER_IMAGE}:${VERSION} .
- docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
- docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
- if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags:
- docker
only:

72
ca.crt
View File

@ -1,4 +1,76 @@
-----BEGIN CERTIFICATE-----
MIIFojCCA4qgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJBVTEM
MAoGA1UECBMDVklDMQ0wCwYDVQQKEwRETENNMQwwCgYDVQQLEwNTU0wxEDAOBgNV
BAMTB0RMQ00gQ0EwHhcNMTcwNzE2MTAxNjAxWhcNMjcwNzE0MTAxNjAxWjBOMQsw
CQYDVQQGEwJBVTEMMAoGA1UECBMDVklDMQ0wCwYDVQQKEwRETENNMQwwCgYDVQQL
EwNXZWIxFDASBgNVBAMTC0RMQ00gV2ViIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEAtRgC2EgcPmHkn4jY5hlGq27G4CKOLMxOTDWVCLX0nn4vaFy8
aTvQx3SnPVTsNrJGw2gkblXo7FXV2HNbAfO45r+4QBxJyjdF67pQm6B6PlGt/fO4
2tLcZqcuQ6wxdjKkO93uNzfB7pD+bmlrc5i9KQNRrS4HH9+/zS9b+r3YnfZo2tyR
GbcuLbAj8VB7H1j8xeR55PWqLyPgC1xdgk6xeMrltrKOUzdpq/X3p5sC72DA56xi
aIzIwH2kX3H1S8K2Gl75X6UhWAi7NBYTCH0vAhnXgSOqRMn+XK7vR1FEisupdB0Z
6NmVUH0IpflZaUsjy4LdwK4iIuCQHEXk3ABDGQIDAQABo4IBjTCCAYkwEgYDVR0T
AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUkphsW8E+qE7apdPf9J4PGgkPc/IwgY8G
A1UdIwSBhzCBhIAUw6GDl9iUoYJ47oU9RDN3DPguaVihaaRnMGUxCzAJBgNVBAYT
AkFVMQwwCgYDVQQIEwNWSUMxEjAQBgNVBAcTCU1lbGJvdXJuZTEUMBIGA1UEChML
TWFzdGVyIFJvb3QxDDAKBgNVBAsTA1NTTDEQMA4GA1UEAxMHUm9vdCBDQYIBATAL
BgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEGMB4GA1UdEgQXMBWGE2h0dHBz
Oi8vc3NsLmRsY20uY28wWAYIKwYBBQUHAQEETDBKMCQGCCsGAQUFBzABhhhodHRw
czovL3NzbC5kbGNtLmNvL29jc3AwIgYIKwYBBQUHMAKGFmh0dHBzOi8vc3NsLmRs
Y20uY28vY2EwKAYDVR0fBCEwHzAdoBugGYYXaHR0cHM6Ly9zc2wuZGxjbS5jby9j
cmwwDQYJKoZIhvcNAQELBQADggIBAKVFSDCZqBvUOU9xSK2EGS8rq6QZJotyW35Z
xcXr3OXilpZZvtZSVfw3DKUaS73Zv/bCEjjB/HdDJbdqneasfWsgMZeXIHsB5Yzw
AUG0WuSwO4PX+WVSbe9XS/q7Gs/fesBzrlOPBwfssClJexasiNbpXI0QLlkq4hq7
siVPSKXkNCPx+DOe6wh8m4hKW0Vrj/lgRn/DdNiK9arVh8rI665FQoJxiA5KsB0+
RbH55M03Yrvt45bciOMy5dm1RXGIVR1PpfQzqOmbToDZNchT82z7iENt+CdlFcVu
o+CG2wCGk+57kau/5PRIsovRXirVAnsxAhSkI1lOGTCcrz48rfvzSTqNSb0DhdBj
XbhkWf/QF8WiqJe97aI6swSsak76ZCdbooTo3n0Skq3sXOXsOx+OOKucDES6B7sv
E10P17LUwNDiGC1efXVWX+vOZPhtaY7O0jEk2Q4ZXxPeuDojfraxWfRjIJopnEU+
Qe4jFes86g+OKKXBNoEB5TI+XO7B63YB/8e2JXIWufNyHAccyBTxU4F6/MMn92Jm
jdK0aPpxxlF+i6x15lnHI19atwgRPdyVWHtuNHC2P9vNypjjd2dOBZ1+YTlJXjk+
d6Q7HSZrkc3wLrNPRLUaLtw8I3W78wS3FVneQ3FbfTgfCOvCBc3w7GoHavgw2mBv
ArxARVZq
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
6JaxFns=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIG5DCCBMygAwIBAgIJAObaLjRg5aFaMA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNV
BAYTAkFVMQwwCgYDVQQIEwNWSUMxEjAQBgNVBAcTCU1lbGJvdXJuZTEUMBIGA1UE
ChMLTWFzdGVyIFJvb3QxDDAKBgNVBAsTA1NTTDEQMA4GA1UEAxMHUm9vdCBDQTAe