ci: better specifcation of versions
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-13 11:48:56 +01:00
parent 95caf46d96
commit 2be7f6b7ba
5 changed files with 26 additions and 11 deletions

View File

@ -9,7 +9,7 @@ platform:
steps: steps:
- name: print env - name: print env
image: appleboy/drone-ssh image: appleboy/drone-ssh:1.6.2
settings: settings:
envs: envs:
- drone_tag - drone_tag
@ -19,7 +19,7 @@ steps:
- drone_repo_namespace - drone_repo_namespace
- ssh_host - ssh_host
- ssh_user - ssh_user
- ssh_root_user - ssh_port
- local_docker_registry - local_docker_registry
- ca_crt - ca_crt
host: host:
@ -32,7 +32,7 @@ steps:
- rm -f env-squid - rm -f env-squid
- "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-squid # \"ssh-host\"" - "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-squid # \"ssh-host\""
- "echo \"export SSH_USER='$${SSH_USER}'\" >> env-squid # \"ssh-user\"" - "echo \"export SSH_USER='$${SSH_USER}'\" >> env-squid # \"ssh-user\""
- "echo \"export SSH_ROOT_USER='$${SSH_ROOT_USER}'\" >> env-squid # \"ssh-root-user\"" - "echo \"export SSH_PORT='$${SSH_PORT}'\" >> env-squid # \"ssh-port\""
- "echo \"export LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-squid # \"local-docker-registry\"" - "echo \"export LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-squid # \"local-docker-registry\""
- "echo \"export CA_CRT='$${CA_CRT}'\" >> env-squid # \"ca-crt\"" - "echo \"export CA_CRT='$${CA_CRT}'\" >> env-squid # \"ca-crt\""
username: username:
@ -44,13 +44,13 @@ steps:
from_secret: local-docker-registry from_secret: local-docker-registry
SSH_HOST: SSH_HOST:
from_secret: ssh-host from_secret: ssh-host
SSH_ROOT_USER: SSH_PORT:
from_secret: ssh-root-user from_secret: ssh-port
SSH_USER: SSH_USER:
from_secret: ssh-user from_secret: ssh-user
- name: scp - name: scp
image: appleboy/drone-scp image: appleboy/drone-scp:1.6.2
settings: settings:
command_timeout: 2m command_timeout: 2m
host: host:
@ -92,7 +92,7 @@ steps:
path: /var/run path: /var/run
- name: deploy squid - name: deploy squid
image: appleboy/drone-ssh image: appleboy/drone-ssh:1.6.2
settings: settings:
envs: envs:
- drone_tag - drone_tag

View File

@ -6,7 +6,7 @@ local settings = import 'settings.libsonnet';
}, },
scp(target): settings.ssh { scp(target): settings.ssh {
name: 'scp', name: 'scp',
image: 'appleboy/drone-scp', image: 'appleboy/drone-scp:1.6.2',
settings +: { settings +: {
command_timeout: '2m', command_timeout: '2m',
target: target, target: target,
@ -16,7 +16,7 @@ local settings = import 'settings.libsonnet';
}, },
}, },
ssh: settings.ssh { ssh: settings.ssh {
image: 'appleboy/drone-ssh', image: 'appleboy/drone-ssh:1.6.2',
settings +: { settings +: {
envs: [ envs: [
'drone_tag', 'drone_tag',

View File

@ -1,7 +1,7 @@
[ [
'ssh-host', 'ssh-host',
'ssh-user', 'ssh-user',
'ssh-root-user', 'ssh-port',
'local-docker-registry', 'local-docker-registry',
'ca-crt', 'ca-crt',
] ]

View File

@ -1,5 +1,4 @@
[ [
'ssh-password',
'ssh-key', 'ssh-key',
'local-registry-password', 'local-registry-password',
'ca-key', 'ca-key',

View File

@ -13,6 +13,22 @@ openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensi
then set secrets ca-crt and ca-key to the created files then set secrets ca-crt and ca-key to the created files
## making dockerconfigjson
the secret dockerconfigjson allows images to be pulled from the local docker repository
if you login to this repository with:
```shell
docker login $LOCAL_DOCKER_REGISTRY --username client --password $REGISTRY_PASSWORD
```
then you will find the required content with:
```shell
cat ~/.docker/config.json
```
## releasing ## releasing
[see here](https://sigyl.com/releases/) [see here](https://sigyl.com/releases/)