docker/nginx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed renew post-hook to call nginx

Browse Source
This commit is contained in:
Deon George 2018-02-08 20:25:13 +11:00
parent 5b75da0aab
commit fbb05f15df
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -6,24 +6,23 @@ stages:
variables: variables:
VERSION: latest VERSION: latest
DOCKER_IMAGE: leenooks/nginx CACHETAG: build
DOCKER_REGISTRY: registry.leenooks.net DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
services: services:
- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind - ${CI_REGISTRY}/leenooks/ci-docker:dind
before_script: before_script:
- docker info - docker info
- docker version - 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: test:
stage: test stage: test
script: script:
- cat /etc/hosts - cat /etc/hosts
- env|sort - env|sort
- docker build -t ${DOCKER_IMAGE}:${VERSION} . - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
- docker images - docker images
only: only:
- debug - debug
@ -31,9 +30,10 @@ test:
build: build:
stage: build stage: build
script: script:
- docker build -t ${DOCKER_IMAGE}:${VERSION} . - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
- docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION} - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags: tags:
- docker - docker
only: only:

2
renew.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
certbot renew -q --config-dir /etc/nginx/conf.d/ssl/letsencrypt/ --renew-hook "kill 1" certbot renew -q --config-dir /etc/nginx/conf.d/ssl/letsencrypt/ --renew-hook "/usr/sbin/nginx -s reload"