From 71384f8c09a8e0b3867a2c73ae09549774a21e85 Mon Sep 17 00:00:00 2001 From: Elton Stoneman Date: Fri, 5 Mar 2021 15:43:14 +0000 Subject: [PATCH] Bump Apache versions --- images/apache/linux/Dockerfile | 2 +- images/apache/windows/Dockerfile | 2 +- jenkins/job_dsl.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/apache/linux/Dockerfile b/images/apache/linux/Dockerfile index a3c4cfc..31ca73b 100644 --- a/images/apache/linux/Dockerfile +++ b/images/apache/linux/Dockerfile @@ -1 +1 @@ -FROM httpd:2.4.41-alpine \ No newline at end of file +FROM httpd:2.4.46-alpine \ No newline at end of file diff --git a/images/apache/windows/Dockerfile b/images/apache/windows/Dockerfile index 6645f53..f14bbbc 100644 --- a/images/apache/windows/Dockerfile +++ b/images/apache/windows/Dockerfile @@ -6,7 +6,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref RUN Invoke-WebRequest -OutFile VC_redist.x64.exe 'aka.ms/vs/16/release/VC_redist.x64.exe' RUN Start-Process .\VC_redist.x64.exe -ArgumentList '/install /passive /norestart' -Wait -ARG HTTPD_VERSION="2.4.43" +ARG HTTPD_VERSION="2.4.46" RUN Write-Host "Downloading Apache version: $env:HTTPD_VERSION"; ` Invoke-WebRequest -OutFile httpd.zip "https://fossies.org/windows/www/httpd-$($env:HTTPD_VERSION)-win64-VS16.zip"; ` Expand-Archive httpd.zip -DestinationPath C:\ ; diff --git a/jenkins/job_dsl.groovy b/jenkins/job_dsl.groovy index 1c59b42..129c6e3 100644 --- a/jenkins/job_dsl.groovy +++ b/jenkins/job_dsl.groovy @@ -95,7 +95,7 @@ for(p in pipelines) { } } triggers { - cron('H H(1-8) * * *') + cron('@weekly') } } } \ No newline at end of file