use gitlab docker registry

This commit is contained in:
Sebastian Hugentobler 2017-09-11 11:15:17 +02:00
parent 50f7f07669
commit 1f9c36d844
4 changed files with 14 additions and 12 deletions

10
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,10 @@
build:
image: docker:latest
services:
- docker:dind
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

View File

@ -1,6 +1,6 @@
FROM quay.io/thallian/confd-env:latest FROM registry.gitlab.com/thallian/docker-confd-env:master
ENV OPENRESTY_VERSION 1.11.2.2 ENV OPENRESTY_VERSION 1.11.2.4
RUN addgroup syncer RUN addgroup syncer
RUN adduser -h /app -D -G syncer syncer RUN adduser -h /app -D -G syncer syncer

View File

@ -16,17 +16,9 @@ http {
# Gin initialization # Gin initialization
{{"{{"}}GIN_INIT{{"}}"}} {{"{{"}}GIN_INIT{{"}}"}}
ssl_session_cache shared:SSL:10m;
ssl_session_timeout 10m;
server { server {
# List port # List port
listen {{"{{"}}GIN_PORT{{"}}"}} ssl; listen {{"{{"}}GIN_PORT{{"}}"}};
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_certificate /etc/ssl/nginx/{{getenv "CERT_NAME" "fullchain.pem"}};
ssl_certificate_key /etc/ssl/nginx/{{getenv "KEY_NAME" "privkey.pem"}};
ssl_ciphers HIGH:!aNULL:!MD5;
keepalive_timeout 70; keepalive_timeout 70;

View File

@ -1,3 +1,3 @@
#!/usr/bin/with-contenv sh #!/usr/bin/with-contenv sh
s6-setuidgid redis redis-server /etc/redis.conf exec s6-setuidgid redis redis-server /etc/redis.conf