Update docker file, changed cron LABEL
This commit is contained in:
parent
edf27d497e
commit
364e4d7e02
@ -14,36 +14,6 @@ before_script:
|
|||||||
- 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
|
||||||
- env|sort
|
- env|sort
|
||||||
|
|
||||||
x86_64:build:
|
include:
|
||||||
variables:
|
- .gitlab-docker-x86_64.yml
|
||||||
VERSION: x86_64
|
- .gitlab-docker-armv7l.yml
|
||||||
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
|
|
||||||
- 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
|
|
||||||
|
16
.gitlab-docker-armv7l.yml
Normal file
16
.gitlab-docker-armv7l.yml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
armv7l:build:
|
||||||
|
variables:
|
||||||
|
VERSION: armv7l-buster
|
||||||
|
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:
|
||||||
|
- buster
|
16
.gitlab-docker-x86_64.yml
Normal file
16
.gitlab-docker-x86_64.yml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
x86_64:build:
|
||||||
|
variables:
|
||||||
|
VERSION: x86_64
|
||||||
|
stage: build
|
||||||
|
image: docker:latest
|
||||||
|
script:
|
||||||
|
- if [ -f init ]; then chmod 500 init; fi
|
||||||
|
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "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
|
||||||
|
- x86_64
|
||||||
|
only:
|
||||||
|
- master
|
@ -23,7 +23,7 @@ RUN echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/so
|
|||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
|
|
||||||
COPY renew.sh /usr/local/sbin
|
COPY renew.sh /usr/local/sbin
|
||||||
LABEL cron.container.weekly root:/usr/local/sbin/renew.sh
|
LABEL cron.container.weekly root#/usr/local/sbin/renew.sh
|
||||||
|
|
||||||
# Expose our web root and log directories log.
|
# Expose our web root and log directories log.
|
||||||
#VOLUME [ "/etc/nginx/conf.d", "/etc/nginx/default.d" ]
|
#VOLUME [ "/etc/nginx/conf.d", "/etc/nginx/default.d" ]
|
||||||
|
Loading…
Reference in New Issue
Block a user