Imbed the maint/timeout graphic in the html
This commit is contained in:
parent
11d495a649
commit
b86d62fb21
@ -1,34 +1,24 @@
|
|||||||
image: docker:latest
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- test
|
|
||||||
- build
|
- build
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
VERSION: latest
|
CACHETAG: build-${VERSION}
|
||||||
CACHETAG: build
|
|
||||||
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
|
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- ${CI_REGISTRY}/leenooks/ci-docker:dind
|
- ${CI_REGISTRY}/leenooks/ci-docker:dind-${VERSION}
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- docker info
|
- docker info
|
||||||
- docker version
|
- docker version
|
||||||
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
|
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
|
||||||
|
|
||||||
test:
|
|
||||||
stage: test
|
|
||||||
script:
|
|
||||||
- cat /etc/hosts
|
|
||||||
- env|sort
|
- env|sort
|
||||||
- docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
|
|
||||||
- docker images
|
|
||||||
only:
|
|
||||||
- debug
|
|
||||||
|
|
||||||
build:
|
x86_64:build:
|
||||||
|
variables:
|
||||||
|
VERSION: x86_64
|
||||||
stage: build
|
stage: build
|
||||||
|
image: docker:latest
|
||||||
script:
|
script:
|
||||||
- if [ -f init ]; then chmod 500 init; fi
|
- if [ -f init ]; then chmod 500 init; fi
|
||||||
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
|
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
|
||||||
@ -37,5 +27,23 @@ build:
|
|||||||
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
- x86_64
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
|
armv7l:build:
|
||||||
|
variables:
|
||||||
|
VERSION: armv7l
|
||||||
|
stage: build
|
||||||
|
image: docker:latest
|
||||||
|
script:
|
||||||
|
- if [ -f init ]; then chmod 500 init; fi
|
||||||
|
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
|
||||||
|
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
|
||||||
|
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
|
||||||
|
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
|
- armv7l
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
@ -6,8 +6,7 @@ COPY etc/nginx/default.d /etc/nginx/default.d
|
|||||||
COPY var/www/maintenance /var/www/maintenance
|
COPY var/www/maintenance /var/www/maintenance
|
||||||
RUN chmod 444 /etc/nginx/default.d/ssl/* && chmod 400 /etc/nginx/default.d/ssl/default.key /etc/nginx/default.d/ssl/dhparams.pem
|
RUN chmod 444 /etc/nginx/default.d/ssl/* && chmod 400 /etc/nginx/default.d/ssl/default.key /etc/nginx/default.d/ssl/dhparams.pem
|
||||||
|
|
||||||
RUN echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list \
|
RUN apt-get update && apt-get -t stretch-backports install certbot -yy \
|
||||||
&& apt-get update && apt-get -t stretch-backports install certbot -yy \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* /tmp/*
|
&& rm -rf /var/lib/apt/lists/* /tmp/*
|
||||||
|
|
||||||
#RUN cd /usr/local/sbin && \
|
#RUN cd /usr/local/sbin && \
|
||||||
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 134 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 118 KiB |
Loading…
Reference in New Issue
Block a user