diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index cc28b6e..1282bbb 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -9,7 +9,7 @@ platform: steps: - name: print env - image: appleboy/drone-ssh + image: appleboy/drone-ssh:1.6.2 settings: envs: - drone_tag @@ -19,7 +19,7 @@ steps: - drone_repo_namespace - ssh_host - ssh_user - - ssh_root_user + - ssh_port - local_docker_registry - ca_crt host: @@ -32,7 +32,7 @@ steps: - rm -f env-squid - "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-squid # \"ssh-host\"" - "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 CA_CRT='$${CA_CRT}'\" >> env-squid # \"ca-crt\"" username: @@ -44,13 +44,13 @@ steps: from_secret: local-docker-registry SSH_HOST: from_secret: ssh-host - SSH_ROOT_USER: - from_secret: ssh-root-user + SSH_PORT: + from_secret: ssh-port SSH_USER: from_secret: ssh-user - name: scp - image: appleboy/drone-scp + image: appleboy/drone-scp:1.6.2 settings: command_timeout: 2m host: @@ -92,7 +92,7 @@ steps: path: /var/run - name: deploy squid - image: appleboy/drone-ssh + image: appleboy/drone-ssh:1.6.2 settings: envs: - drone_tag diff --git a/.drone/lib/images.libsonnet b/.drone/lib/images.libsonnet index 2819fd0..b67fc35 100644 --- a/.drone/lib/images.libsonnet +++ b/.drone/lib/images.libsonnet @@ -6,7 +6,7 @@ local settings = import 'settings.libsonnet'; }, scp(target): settings.ssh { name: 'scp', - image: 'appleboy/drone-scp', + image: 'appleboy/drone-scp:1.6.2', settings +: { command_timeout: '2m', target: target, @@ -16,7 +16,7 @@ local settings = import 'settings.libsonnet'; }, }, ssh: settings.ssh { - image: 'appleboy/drone-ssh', + image: 'appleboy/drone-ssh:1.6.2', settings +: { envs: [ 'drone_tag', diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet index 4901236..2ecbd9e 100644 --- a/.drone/lib/public-secrets.libsonnet +++ b/.drone/lib/public-secrets.libsonnet @@ -1,7 +1,7 @@ [ 'ssh-host', 'ssh-user', - 'ssh-root-user', + 'ssh-port', 'local-docker-registry', 'ca-crt', ] diff --git a/.drone/lib/secret-secrets.libsonnet b/.drone/lib/secret-secrets.libsonnet index 28025b7..655c06a 100644 --- a/.drone/lib/secret-secrets.libsonnet +++ b/.drone/lib/secret-secrets.libsonnet @@ -1,5 +1,4 @@ [ - 'ssh-password', 'ssh-key', 'local-registry-password', 'ca-key', diff --git a/README.md b/README.md index 3b9fc78..36d4082 100644 --- a/README.md +++ b/README.md @@ -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 +## 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 [see here](https://sigyl.com/releases/) \ No newline at end of file