From 05402d7a442b779d684b1423f787acc952a94a25 Mon Sep 17 00:00:00 2001 From: Ahmad Iqbal Ali Date: Wed, 6 May 2020 09:26:03 +0200 Subject: [PATCH 1/4] fix default cron schedule --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 384762c..643aa24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM stakater/base-alpine:3.7 ARG LOGROTATE_VERSION=3.13.0-r0 -ENV CRON_SCHEDULE="0 0 * * * *" +ENV CRON_SCHEDULE="0 0 * * *" RUN apk --update add "logrotate=${LOGROTATE_VERSION}" RUN echo "${CRON_SCHEDULE} /usr/sbin/logrotate -v /etc/logrotate.conf" >> /etc/crontabs/root && \ mkdir -p /etc/logrotate.d @@ -9,4 +9,4 @@ RUN echo "${CRON_SCHEDULE} /usr/sbin/logrotate -v /etc/logrotate.conf" >> /etc/c ADD logrotate.conf /etc/logrotate.conf ENTRYPOINT [ ] -CMD ["crond", "-f"] \ No newline at end of file +CMD ["crond", "-f"] From 6a5291d4e5411bb6c58e5e8cffb6f219fd17041d Mon Sep 17 00:00:00 2001 From: "Ali, Ahmad /External" Date: Thu, 7 May 2020 14:41:05 +0200 Subject: [PATCH 2/4] add jenkinsfile --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..8ed3343 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,6 @@ +#!/usr/bin/env groovy +@Library('github.com/stakater/stakater-pipeline-library@v2.16.27') _ + +pushDockerImage { + dockerRepositoryURL = "docker.io" +} \ No newline at end of file From 47b59a2110fc776c246be0b8ed915481060299e7 Mon Sep 17 00:00:00 2001 From: "Ali, Ahmad /External" Date: Thu, 7 May 2020 17:05:17 +0200 Subject: [PATCH 3/4] logrotate-3.15 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 643aa24..bf91eb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM stakater/base-alpine:3.7 +FROM stakater/base-alpine:3.11 -ARG LOGROTATE_VERSION=3.13.0-r0 +ARG LOGROTATE_VERSION=3.15.1-r0 ENV CRON_SCHEDULE="0 0 * * *" RUN apk --update add "logrotate=${LOGROTATE_VERSION}" RUN echo "${CRON_SCHEDULE} /usr/sbin/logrotate -v /etc/logrotate.conf" >> /etc/crontabs/root && \ From 3f6af826b986184f08ce36eaefc7e5332fc5d8aa Mon Sep 17 00:00:00 2001 From: "Ali, Ahmad /External" Date: Wed, 13 May 2020 18:38:05 +0200 Subject: [PATCH 4/4] docker image prefix with version --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8ed3343..ce24590 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,4 +3,5 @@ pushDockerImage { dockerRepositoryURL = "docker.io" + imagePrefix = "3.15.1" } \ No newline at end of file