diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38887b8..867c868 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,24 @@
-image: docker:latest
-
stages:
-- test
- build
variables:
- VERSION: latest
- CACHETAG: build
+ CACHETAG: build-${VERSION}
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
services:
-- ${CI_REGISTRY}/leenooks/ci-docker:dind
+- ${CI_REGISTRY}/leenooks/ci-docker:dind-${VERSION}
before_script:
- docker info
- docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
+- env|sort
-test:
- stage: test
- script:
- - cat /etc/hosts
- - env|sort
- - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
- - docker images
- only:
- - debug
-
-build:
+x86_64:build:
+ variables:
+ VERSION: x86_64
stage: build
+ image: docker:latest
script:
- if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
@@ -37,5 +27,23 @@ build:
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags:
- 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:
- master
diff --git a/Dockerfile b/Dockerfile
index 55b237e..bd47ff7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,7 @@ COPY etc/nginx/default.d /etc/nginx/default.d
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 echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list \
- && apt-get update && apt-get -t stretch-backports install certbot -yy \
+RUN apt-get update && apt-get -t stretch-backports install certbot -yy \
&& rm -rf /var/lib/apt/lists/* /tmp/*
#RUN cd /usr/local/sbin && \
diff --git a/var/www/maintenance/maintenance.html b/var/www/maintenance/maintenance.html
index 0e9e2fa..89c7eb6 100644
--- a/var/www/maintenance/maintenance.html
+++ b/var/www/maintenance/maintenance.html
@@ -21,7 +21,2063 @@
We’ll be back very soon!
-
+
Sorry for the inconvenience but we’re making some important changes. It shouldn’t take very long.
We plan to be back online within 15 minutes.
@@ -89,9 +2145,9 @@ function extractDomain(url) {
// if there's a cookie with the name myClock, use that value as the deadline
var deadline = 0;
-if(document.cookie && document.cookie.match('myClock') && document.cookie.match(/(^|;)myClock=([^;]+)/)){
+if(document.cookie && document.cookie.match('myClock') && document.cookie.match(/(^|;)\s?myClock=([^;]+)/)){
// get deadline value from cookie
- var deadline = document.cookie.match(/(^|;)myClock=([^;]+)/)[2];
+ var deadline = document.cookie.match(/(^|;)\s?myClock=([^;]+)/)[2];
var t = getTimeRemaining(deadline);
if (t.total <= 0) {
deadline = 0;
diff --git a/var/www/maintenance/maintenance.jpg b/var/www/maintenance/maintenance.jpg
deleted file mode 100644
index 333d958..0000000
Binary files a/var/www/maintenance/maintenance.jpg and /dev/null differ
diff --git a/var/www/maintenance/timeout.html b/var/www/maintenance/timeout.html
index db6f909..fa89f58 100644
--- a/var/www/maintenance/timeout.html
+++ b/var/www/maintenance/timeout.html
@@ -21,7 +21,2634 @@
The remote server is not responding?
-
+
Sorry for the inconvenience but the remote server is not responding.
We'll try again in 2 minutes, but if it still isnt responding, please let us know.
diff --git a/var/www/maintenance/timeout.jpg b/var/www/maintenance/timeout.jpg
deleted file mode 100644
index 36fb994..0000000
Binary files a/var/www/maintenance/timeout.jpg and /dev/null differ