.drone/.drone-home.yml

@@ -0,0 +1,155 @@
+---
+kind: pipeline
+type: docker
+name: build
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: print env
+  image: appleboy/drone-ssh
+  settings:
+    envs:
+    - drone_tag
+    - drone_commit
+    - drone_build_number
+    - drone_repo_name
+    - drone_repo_namespace
+    - ssh_host
+    - ssh_user
+    - ssh_root_user
+    - local_docker_registry
+    - ca_crt
+    host:
+      from_secret: ssh-host
+    key:
+      from_secret: ssh-key
+    port:
+      from_secret: ssh-port
+    script:
+    - 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 LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-squid # \"local-docker-registry\""
+    - "echo \"export CA_CRT='$${CA_CRT}'\" >> env-squid # \"ca-crt\""
+    username:
+      from_secret: ssh-user
+  environment:
+    CA_CRT:
+      from_secret: ca-crt
+    LOCAL_DOCKER_REGISTRY:
+      from_secret: local-docker-registry
+    SSH_HOST:
+      from_secret: ssh-host
+    SSH_ROOT_USER:
+      from_secret: ssh-root-user
+    SSH_USER:
+      from_secret: ssh-user
+
+- name: scp
+  image: appleboy/drone-scp
+  settings:
+    command_timeout: 2m
+    host:
+      from_secret: ssh-host
+    key:
+      from_secret: ssh-key
+    port:
+      from_secret: ssh-port
+    source:
+    - .
+    target: /stack/squid
+    username:
+      from_secret: ssh-user
+
+- name: wait
+  image: alpine
+  commands:
+  - sleep 15
+
+- name: "dockerbuild docker:dind image:"
+  image: docker:dind
+  commands:
+  - set -e
+  - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"
+  - cd docker-dind
+  - echo "$${CA_CRT}" > CA_crt.crt
+  - echo "$${CA_CRT}"
+  - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind1
+  - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind1
+  - docker logout $${LOCAL_DOCKER_REGISTRY}
+  environment:
+    CA_CRT:
+      from_secret: ca-crt
+    LOCAL_DOCKER_REGISTRY:
+      from_secret: local-docker-registry
+    LOCAL_REGISTRY_PASSWORD:
+      from_secret: local-registry-password
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+- name: deploy squid
+  image: appleboy/drone-ssh
+  settings:
+    envs:
+    - drone_tag
+    - drone_commit
+    - drone_build_number
+    - drone_repo_name
+    - drone_repo_namespace
+    - local_docker_registry
+    - local_registry_password
+    - ca_crt
+    - ca_key
+    host:
+      from_secret: ssh-host
+    key:
+      from_secret: ssh-key
+    port:
+      from_secret: ssh-port
+    script:
+    - rm -f -R /stack/squid/.secrets
+    - mkdir -p /stack/squid/.secrets
+    - echo "$${CA_CRT}" > /stack/squid/.secrets/ca.crt
+    - echo "$${CA_KEY}" > /stack/squid/.secrets/ca.key
+    - set -e
+    - cd /stack/squid/myCA
+    - cd ..
+    - docker stack deploy -c docker-compose.yml squid
+    username:
+      from_secret: ssh-user
+  environment:
+    CA_CRT:
+      from_secret: ca-crt
+    CA_KEY:
+      from_secret: ca-key
+    LOCAL_DOCKER_REGISTRY:
+      from_secret: local-docker-registry
+    LOCAL_REGISTRY_PASSWORD:
+      from_secret: local-registry-password
+
+services:
+- name: docker
+  image: docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+  - name: ca
+    path: /etc/docker/certs.d
+
+volumes:
+- name: dockersock
+  temp: {}
+- name: ca
+  host:
+    path: /etc/docker/certs.d
+
+image_pull_secrets:
+- dockerconfigjson
+
+...

.drone/build.sh

@@ -1,2 +0,0 @@
-echo "${CA_CRT}" > docker-dind/CA_crt.crt
-docker build docker-dind -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/docker-dind

.drone/deploy.sh

@@ -1,7 +0,0 @@
-docker stack rm squid
-echo 'sleeping...zzz'
-sleep 60
-mkdir -p .secrets
-echo "${CA_CRT}" > .secrets/ca.crt
-echo "${CA_KEY}" > .secrets/ca.key
-docker stack deploy -c docker-compose.yml squid

.drone/drone-home.jsonnet

@@ -1,33 +1,150 @@
-
+local images = import 'lib/images.libsonnet';
+local environment = import 'node_modules/@sigyl/jsonnet-drone-environment/environment.libsonnet';
+local compose = import 'node_modules/@sigyl/jsonnet-compose/compose.libsonnet';
 local secretSecrets = import 'lib/secret-secrets.libsonnet';
 local publicSecrets = import 'lib/public-secrets.libsonnet';
-
+local util = import 'lib/util.libsonnet';
-local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet';
-local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
 [
-  register,
+  {
-  deploy(
+    kind: 'pipeline',
-    'squid',
+    type: 'docker',
-    '/stack/',
+    name: 'build',
-    [
+    clone: {
-      'CA_CRT',
+      disable: false,
+      depth: 0,
+    },
+    /*trigger: {
+      event: [
+        'tag',
       ],
+    },*/
+    services: [
+      images.docker {
+        privileged: true,
+        volumes: [
+          {
+            name: 'dockersock',
+            path: '/var/run',
+          },
+          {
+            name: 'ca',
+            path: '/etc/docker/certs.d',
+          },
+        ],
+      },
+    ],
+    volumes: [
+      {
+        name: 'dockersock',
+        temp: {},
+      },
+      {
+        name: 'ca',
+        host: {
+          path: '/etc/docker/certs.d',
+        },
+      },
+    ],
+    steps:[
+      compose(
+        std.map(
+          function(secret) util.printEnv('env-squid', secret),
           publicSecrets,
-    secretSecrets,
+        )
-    [
+      )
-      'DOMAIN',
+      (
-      'REGISTRY_DOMAIN',
+        images.ssh {
-      'REGISTRY_PORT',
+          settings +: {
-      'REGISTRY_PASSWORD',
+            script: [
+              'rm -f env-squid',
             ],
+          },
+        },
       ) {
-    trigger +: {
+        name: 'print env',
-      event +: [
-        'promote',
-      ],
-      target +: [
-        'production',
-      ],
       },
+      images.scp(
+        '/stack/squid'
+      ),
+      images.wait(15),
+      images.docker {
+        name +: 'build docker:dind image:',
+        environment +: environment.environmentSecrets([
+          'LOCAL_DOCKER_REGISTRY',
+          'LOCAL_REGISTRY_PASSWORD',
+          'CA_CRT'
+        ]),
+        volumes: [
+          {
+            name: 'dockersock',
+            path: '/var/run',
           },
+        ],
+        commands: [
+          'set -e',
+          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
+          'cd docker-dind',
+          'echo "$${CA_CRT}" > CA_crt.crt',
+          'echo "$${CA_CRT}"',
+          'docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind1',
+          'docker push $${LOCAL_DOCKER_REGISTRY}docker:dind1',
+          'docker logout $${LOCAL_DOCKER_REGISTRY}',
+        ],
+      }, /*
+      images.docker {
+        name +: 'build docker image:',
+        environment +: environment.environmentSecrets([
+          'LOCAL_DOCKER_REGISTRY',
+          'LOCAL_REGISTRY_PASSWORD',
+        ]),
+        volumes: [
+          {
+            name: 'dockersock',
+            path: '/var/run',
+          },
+        ],
+        commands: [
+          'set -e',
+          'pwd',
+          'sleep 15',
+          'cd docker',
+          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
+          'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid',
+          'docker push $${LOCAL_DOCKER_REGISTRY}squid',
+          'docker logout $${LOCAL_DOCKER_REGISTRY}',
+        ],
+      } */
+      compose([
+        environment.envSet('local-docker-registry'),
+        environment.envSet('local-registry-password'),
+        environment.envSet('ca-crt'),
+        environment.envSet('ca-key'),
+      ])(
+        images.ssh  {
+          name: 'deploy squid',
+          settings +: {
+            script +: [
+              'rm -f -R /stack/squid/.secrets',
+              'mkdir -p /stack/squid/.secrets',
+              'echo "$${CA_CRT}" > /stack/squid/.secrets/ca.crt',
+              'echo "$${CA_KEY}" > /stack/squid/.secrets/ca.key',
+              'set -e',
+              //"docker network prune -f",
+              "cd /stack/squid/myCA",
+              //'openssl genrsa -out CA_key.pem 2048',
+              //'openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensions v3_ca -config openssl.cnf    -subj "/C=US/ST=California/L=Mountain View/O=Google/OU=Enterprise/CN=MyCA"',
+              'cd ..',
+              //"docker stack rm squid",
+              //"sleep 60",
+              // "docker volume rm squid_squid-cache",
+              "docker stack deploy -c docker-compose.yml squid",
+            ]
+          }
+        },
+      ),
+    ],
+    image_pull_secrets: [
+      'dockerconfigjson'
+    ]
+  }
 ]

.drone/drone-home.yml

@@ -1,24 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: register
+name: build
-
-platform:
-  os: linux
-  arch: amd64
-
-clone:
-  disable: true
-
-trigger:
-  event:
-    exclude:
-    - promote
-
----
-kind: pipeline
-type: docker
-name: deploy
 
 platform:
   os: linux
@@ -26,7 +9,7 @@ platform:
 
 steps:
 - name: print env
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh
   settings:
     envs:
     - drone_tag
@@ -34,64 +17,83 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
+    - ssh_host
+    - ssh_user
+    - ssh_root_user
+    - local_docker_registry
     - ca_crt
-    - ca_crt
+    host:
-    - local_domain
+      from_secret: ssh-host
-    - ca_key
+    key:
-    host: ${SSH_HOST}
+      from_secret: ssh-key
-    key: ${SSH_KEY}
+    port:
-    passphrase: ${SSH_PASSPHRASE}
+      from_secret: ssh-port
-    port: ${SSH_PORT}
     script:
     - 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 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:
-    - "echo \"export LOCAL_DOMAIN='$${LOCAL_DOMAIN}'\" >> env-squid # \"local-domain\""
+      from_secret: ssh-user
-    - "echo \"export CA_KEY='$${CA_KEY}'\" >> env-squid # \"ca-key\""
-    username: ${SSH_USER}
   environment:
     CA_CRT:
       from_secret: ca-crt
-    CA_KEY:
+    LOCAL_DOCKER_REGISTRY:
-      from_secret: ca-key
+      from_secret: local-docker-registry
-    LOCAL_DOMAIN:
+    SSH_HOST:
-      from_secret: local-domain
+      from_secret: ssh-host
+    SSH_ROOT_USER:
+      from_secret: ssh-root-user
+    SSH_USER:
+      from_secret: ssh-user
 
 - name: scp
-  image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
+  image: appleboy/drone-scp
   settings:
     command_timeout: 2m
-    host: ${SSH_HOST}
+    host:
-    key: ${SSH_KEY}
+      from_secret: ssh-host
-    passphrase: ${SSH_PASSPHRASE}
+    key:
-    port: ${SSH_PORT}
+      from_secret: ssh-key
+    port:
+      from_secret: ssh-port
     source:
     - .
     target: /stack/squid
-    username: ${SSH_USER}
+    username:
+      from_secret: ssh-user
 
 - name: wait
-  image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
+  image: alpine
   commands:
   - sleep 15
 
-- name: "dockerbuild:"
+- name: "dockerbuild docker:dind image:"
-  image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
+  image: docker:dind
   commands:
   - set -e
-  - sh .drone/login.sh
+  - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"
-  - sh .drone/build.sh
+  - cd docker-dind
-  - sh .drone/push.sh
+  - echo "$${CA_CRT}" > CA_crt.crt
-  - sh .drone/logout.sh
+  - echo "$${CA_CRT}"
+  - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind1
+  - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind1
+  - docker logout $${LOCAL_DOCKER_REGISTRY}
   environment:
     CA_CRT:
       from_secret: ca-crt
+    LOCAL_DOCKER_REGISTRY:
+      from_secret: local-docker-registry
+    LOCAL_REGISTRY_PASSWORD:
+      from_secret: local-registry-password
   volumes:
   - name: dockersock
     path: /var/run
 
-- name: deploy
+- name: deploy squid
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh
   settings:
     envs:
     - drone_tag
@@ -99,44 +101,40 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
-    - domain
+    - local_docker_registry
-    - registry_domain
+    - local_registry_password
-    - registry_port
-    - registry_password
     - ca_crt
-    - local_domain
     - ca_key
-    - ca_crt
+    host:
-    host: ${SSH_HOST}
+      from_secret: ssh-host
-    key: ${SSH_KEY}
+    key:
-    passphrase: ${SSH_PASSPHRASE}
+      from_secret: ssh-key
-    port: ${SSH_PORT}
+    port:
+      from_secret: ssh-port
     script:
-    - export CA_KEY=$${CA_KEY}
+    - rm -f -R /stack/squid/.secrets
-    - export CA_CRT=$${CA_CRT}
+    - mkdir -p /stack/squid/.secrets
-    - export LOCAL_DOMAIN=$${LOCAL_DOMAIN}
+    - echo "$${CA_CRT}" > /stack/squid/.secrets/ca.crt
-    - export CA_CRT=$${CA_CRT}
+    - echo "$${CA_KEY}" > /stack/squid/.secrets/ca.key
-    - export DOMAIN=$${DOMAIN}
-    - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
-    - export REGISTRY_PORT=$${REGISTRY_PORT}
-    - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
     - set -e
-    - cd /stack/squid
+    - cd /stack/squid/myCA
-    - sh .drone/login.sh
+    - cd ..
-    - sh .drone/pull.sh
+    - docker stack deploy -c docker-compose.yml squid
-    - sh .drone/deploy.sh
+    username:
-    username: ${SSH_USER}
+      from_secret: ssh-user
   environment:
     CA_CRT:
       from_secret: ca-crt
     CA_KEY:
       from_secret: ca-key
-    LOCAL_DOMAIN:
+    LOCAL_DOCKER_REGISTRY:
-      from_secret: local-domain
+      from_secret: local-docker-registry
+    LOCAL_REGISTRY_PASSWORD:
+      from_secret: local-registry-password
 
 services:
 - name: docker
-  image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
+  image: docker:dind
   privileged: true
   volumes:
   - name: dockersock
@@ -151,10 +149,7 @@ volumes:
   host:
     path: /etc/docker/certs.d
 
-trigger:
+image_pull_secrets:
-  event:
+- dockerconfigjson
-  - promote
-  target:
-  - production
 
 ...

.drone/lib/images.libsonnet

@@ -0,0 +1,38 @@
+local settings = import 'settings.libsonnet';
+{
+  docker: {
+    name: 'docker',
+    image: 'docker:dind',
+  },
+  scp(target): settings.ssh {
+    name: 'scp',
+    image: 'appleboy/drone-scp',
+    settings +: {
+      command_timeout: '2m',
+      target: target,
+      source: [
+        '.',
+      ],
+    },
+  },
+  ssh: settings.ssh {
+    image: 'appleboy/drone-ssh',    
+    settings +: {
+      envs: [
+        'drone_tag',
+        'drone_commit',
+        'drone_build_number',
+        'drone_repo_name',
+        'drone_repo_namespace',
+      ],
+      script: [],
+    },
+  },
+  wait(delay): {
+    image: 'alpine',
+    name: 'wait',
+    commands: [
+      'sleep %s' % delay,
+    ],
+  }
+}

.drone/lib/public-secrets.libsonnet

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

.drone/lib/secret-secrets.libsonnet

@@ -1,3 +1,6 @@
 [
+  'ssh-password',
+  'ssh-key',
+  'local-registry-password',
   'ca-key',
 ]

.drone/lib/settings.libsonnet

@@ -0,0 +1,11 @@
+local environment = import '../node_modules/@sigyl/jsonnet-drone-environment/environment.libsonnet';
+{
+  ssh: {
+    settings +: {
+      host: environment.fromSecret('ssh-host'),
+      port: environment.fromSecret('ssh-port'),
+      username: environment.fromSecret('ssh-user'),
+      key: environment.fromSecret('ssh-key'),  
+    },
+  },
+}

.drone/lib/util.libsonnet

@@ -0,0 +1,18 @@
+local compose = import '../node_modules/@sigyl/jsonnet-compose/compose.libsonnet';
+local environment = import '../node_modules/@sigyl/jsonnet-drone-environment/environment.libsonnet';
+{
+  printEnv(file, env): function(step) compose([
+    environment.envSet(env),
+    function(step) step {
+      settings +: {
+        script +: [
+          'echo "export %(environment)s=\'$${%(environment)s}\'" >> %(file)s # "%(secret)s"' % {
+            environment: environment.environment(env),
+            file: file,
+            secret: environment.secret(env),
+          },
+        ],
+      },
+    },
+  ])(step),
+}

.drone/login.sh

@@ -1 +0,0 @@
-docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}"

.drone/logout.sh

@@ -1 +0,0 @@
-docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT}

.drone/package.json

@@ -4,6 +4,7 @@
     "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
   },
   "dependencies": {
-    "@sigyl/jsonnet-drone": "^0.1.0"
+    "@sigyl/jsonnet-compose": "^0.0.2",
+    "@sigyl/jsonnet-drone-environment": "0.0.5"
   }
 }

.drone/pull.sh

@@ -1 +0,0 @@
-docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/docker-dind

.drone/push.sh

@@ -1 +0,0 @@
-docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/docker-dind

.drone/yarn-error.log

@@ -1,21 +1,23 @@
 Arguments: 
-  /usr/local/Cellar/node/11.9.0/bin/node /usr/local/Cellar/yarn/1.13.0/libexec/bin/yarn.js
+  /usr/bin/node /home/giles/.yarn/bin/yarn.js
 
 PATH: 
-  /Users/giles/.cargo/bin:/Users/giles/.local/bin:/Users/giles/Library/Python/3.7/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/share/dotnet:/usr/local/share/dotnet/sdk:/usr/local/share/dotnet/sdk/2.2.101:/opt/X11/bin:~/.dotnet/tools:/usr/local/bin:/usr/local/Cellar/openssl/1.0.2j/bin/openssl
+  /home/giles/.yarn/bin:/home/giles/.config/yarn/global/node_modules/.bin:/home/giles/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/go/bin
 
 Yarn version: 
-  1.13.0
+  1.22.4
 
 Node version: 
-  12.13.1
+  11.14.0
 
 Platform: 
-  darwin x64
+  linux x64
 
 Trace: 
-  Error: getaddrinfo ENOTFOUND registry.yarnpkg.com
+  Error: self signed certificate in certificate chain
-      at GetAddrInfoReqWrap.onlookup [as oncomplete] (dns.js:60:26)
+      at TLSSocket.onConnectSecure (_tls_wrap.js:1176:34)
+      at TLSSocket.emit (events.js:193:13)
+      at TLSSocket._finishInit (_tls_wrap.js:667:8)
 
 npm manifest: 
   {
@@ -24,7 +26,7 @@ npm manifest:
       "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
     },
     "dependencies": {
-      "@sigyl/jsonnet-drone": "^0.0.3"
+      "@sigyl/jsonnet-compose": "^0.0.2"
     }
   }
 
@@ -32,24 +34,4 @@ yarn manifest:
   No manifest
 
 Lockfile: 
-  # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+  No lockfile
-  # yarn lockfile v1
-  
-  
-  "@sigyl/jsonnet-compose@^0.0.2":
-    version "0.0.2"
-    resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-compose/-/jsonnet-compose-0.0.2.tgz#8900a21e8cd8109929b6042703f8645aacb9bcda"
-    integrity sha512-wWS3CgPeNi/o1pcS6n/4pafxlMD0KC9/RKMZr/ySmzeGNRW++sPuKuxajYse2TNd47uNDdeUSnk4aEeEIKL0zA==
-  
-  "@sigyl/jsonnet-drone-environment@0.0.5":
-    version "0.0.5"
-    resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
-    integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
-  
-  "@sigyl/jsonnet-drone@^0.0.2":
-    version "0.0.2"
-    resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.0.2.tgz#64572524155eaa2c2b8bda6102f238a0269cafbb"
-    integrity sha512-1/EZR5Vbo8oKAm+R31XIzsS6VZxcEIcRLyrLi53JQ0+z+CWLPvrUwiq0homBysYJhqk1XRzYF6+ctwbbmmzxrA==
-    dependencies:
-      "@sigyl/jsonnet-compose" "^0.0.2"
-      "@sigyl/jsonnet-drone-environment" "0.0.5"

.drone/yarn.lock

@@ -11,11 +11,3 @@
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
   integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
-
-"@sigyl/jsonnet-drone@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.0.tgz#feda1797e8e9ef799cad72e65f7163ca26a9e3a5"
-  integrity sha512-QY/ngucxFOtLfL8Mt0f2bxN4fQDUOGOFtaRpSH2cNyg84xADkzehT0ORZtbLitr+AwhyF5KN/zAGvzkyNAoqPw==
-  dependencies:
-    "@sigyl/jsonnet-compose" "^0.0.2"
-    "@sigyl/jsonnet-drone-environment" "0.0.5"

.gitignore

@@ -1,3 +1 @@
 node_modules
-*.log
-.secrets

CHANGELOG.md

@@ -2,30 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [0.0.8](https://sigyl.com/git/stack/squid/compare/v0.0.7...v0.0.8) (2020-08-28)
-
-
-### Bug Fixes
-
-* no need for cd to myCA ([8135c9c](https://sigyl.com///commit/8135c9c88c18e864d5b2084d79523dc116cd356d))
-* rename local_registry_password ([eb113d0](https://sigyl.com///commit/eb113d091d1c2ae1f35ad986d924f081d7f0e5cc))
-* rename local-registry-password to registry-password ([2e09f39](https://sigyl.com///commit/2e09f39cdc99314e90f2f78ce02ff5e094fb0bd5))
-* rm stack ([581abb7](https://sigyl.com///commit/581abb7746a33dbff8cf94668d8b49e8d89f1311))
-* wrong folder! ([8233fe2](https://sigyl.com///commit/8233fe28be8e25a36d0ffaa1bba54e3314729333))
-
-### [0.0.7](https://sigyl.com/git/stack/squid/compare/v0.0.6...v0.0.7) (2020-08-12)
-
-
-### Features
-
-* pre-commit hook to build jsonnet ([2377c54](https://sigyl.com///commit/2377c542e3a7f6e026239a1655d1c50c9d87e019))
-
-
-### Bug Fixes
-
-* change file mode ([c03054a](https://sigyl.com///commit/c03054a23c227305c7b1dfb943241c2b5ac16677))
-* git-hooks ([0d61cf5](https://sigyl.com///commit/0d61cf53ca9db5b10b9800f9af4628612cd4950f))
-
 ### [0.0.6](https://sigyl.com/git/stack/squid/compare/v0.0.5...v0.0.6) (2020-08-12)
 
 

README.md

@@ -11,23 +11,7 @@ openssl genrsa -out CA_key.pem 2048
 openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensions v3_ca -config openssl.cnf    -subj "/C=UK/ST=Devon/L=Rose Ash/O=Google/OU=SiGyl/CN=Proxy-ca"
 ```
 
-then set drone 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 drone 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
 

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - HTTP_PORT=3128
       - MITM_CERT=/run/secrets/ca.crt
       - MITM_KEY=/run/secrets/ca.key
-      - VISIBLE_HOSTNAME=$LOCAL_DOMAIN
+      - VISIBLE_HOSTNAME=git.local-domain
       - >
         EXTRA_CONFIG1=tls_outgoing_options
         capath=/etc/ssl/certs

docker-dind/Dockerfile

@@ -1,3 +1,3 @@
 FROM docker:18.06.0-dind
-COPY ./CA_crt.crt /usr/local/share/ca-certificates/CA_crt.crt
+COPY CA_crt.crt /usr/local/share/ca-certificates/CA_crt.crt
 RUN update-ca-certificates

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.0.8",
+  "version": "0.0.6",
   "scripts": {
     "release": "standard-version",
     "release:message": "standard-version --releaseCommitMessageFormat",