Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #315 from jenkinsci/updatecli_0ff9cc33093f980d2681…
Browse files Browse the repository at this point in the history
…2405c80fd1be3ee35c040c282120c73844ae601e5f26

Bump the parent image `jenkins/agent` version to 3077.vd69cf116da_6f-4
  • Loading branch information
dduportal authored Dec 12, 2022
2 parents e02e71b + fe44335 commit e804730
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions 11/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
# THE SOFTWARE.

#TODO(oleg_nenashev): Does it also need an update?
ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-alpine-jdk11

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
4 changes: 2 additions & 2 deletions 11/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk11

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
4 changes: 2 additions & 2 deletions 11/windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk11-nanoserver-1809

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"

ARG user=jenkins
Expand Down
2 changes: 1 addition & 1 deletion 11/windows/windowsservercore-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk11-windowsservercore-ltsc2019

LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
Expand Down
4 changes: 2 additions & 2 deletions 17/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
# THE SOFTWARE.

#TODO(oleg_nenashev): Does it also need an update?
ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-alpine-jdk17

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
4 changes: 2 additions & 2 deletions 17/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk17

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
4 changes: 2 additions & 2 deletions 17/windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk17-nanoserver-1809

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"

ARG user=jenkins
Expand Down
2 changes: 1 addition & 1 deletion 17/windows/windowsservercore-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3077.vd69cf116da_6f-3
ARG version=3077.vd69cf116da_6f-4
FROM jenkins/agent:${version}-jdk17-windowsservercore-ltsc2019

LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ variable "IMAGE_TAG" {

#### This is for the "parent" image version to use (jenkins/agent:<PARENT_IMAGE_AGENT_VERSION>-<base-os>)
variable "PARENT_IMAGE_VERSION" {
default = "3077.vd69cf116da_6f-3"
default = "3077.vd69cf116da_6f-4"
}

variable "REGISTRY" {
Expand Down
2 changes: 1 addition & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Param(
[String] $AdditionalArgs = '',
[String] $Build = '',
[String] $VersionTag = '3071.v7e9b_0dc08466-1',
[String] $DockerAgentVersion = '3077.vd69cf116da_6f-3',
[String] $DockerAgentVersion = '3077.vd69cf116da_6f-4',
[switch] $PushVersions = $false
)

Expand Down

0 comments on commit e804730

Please sign in to comment.