stack
/
squid
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

test: squid:4
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-06 13:52:00 +01:00
parent b5a46efd51
commit 4afecdbaf8
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone/drone-home.jsonnet
View File

@ -104,13 +104,13 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
settings +: { settings +: {
script +: [ script +: [
'set -e', 'set -e',
"docker network prune -f", //"docker network prune -f",
"cd /stack/squid/myCA", "cd /stack/squid/myCA",
//'openssl genrsa -out CA_key.pem 2048', //'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"', //'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 ..', 'cd ..',
"docker stack rm squid", //"docker stack rm squid",
"sleep 60", //"sleep 60",
// "docker volume rm squid_squid-cache", // "docker volume rm squid_squid-cache",
//'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid', //'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid',
//'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"', //'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',

3
.drone/drone-home.yml
View File

@ -48,11 +48,8 @@ steps:
from_secret: ssh-port from_secret: ssh-port
script: script:
- set -e - set -e
- docker network prune -f
- cd /stack/squid/myCA - cd /stack/squid/myCA
- cd .. - cd ..
- docker stack rm squid
- sleep 60
- docker stack deploy -c docker-compose.yml squid - docker stack deploy -c docker-compose.yml squid
username: username:
from_secret: ssh-user from_secret: ssh-user

3
docker-compose.yml
View File

@ -16,7 +16,8 @@ services:
- VISIBLE_HOSTNAME=git.local-domain - VISIBLE_HOSTNAME=git.local-domain
- EXTRA_CONFIG1=tls_outgoing_options capath=/etc/ssl/certs \ - EXTRA_CONFIG1=tls_outgoing_options capath=/etc/ssl/certs \
options=NO_SSLv3,NO_TLSv1 \ options=NO_SSLv3,NO_TLSv1 \
cipher=ALL:!RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS cipher=ALL:!RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS \
MIN_VERSION=1.2
- EXTRA_CONFIG2=sslproxy_cipher EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH+aRSA+RC4:EECDH:EDH+aRSA:!RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS - EXTRA_CONFIG2=sslproxy_cipher EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH+aRSA+RC4:EECDH:EDH+aRSA:!RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS
# - CONFIG_DISABLE=yes # - CONFIG_DISABLE=yes
volumes: volumes: