Skip to content

Commit

Permalink
Merge pull request #99 from jeffret-b/remoting-3.40
Browse files Browse the repository at this point in the history 
Update to Remoting 3.40.
  • Loading branch information
@oleg-nenashev
oleg-nenashev authored Jan 10, 2020
2 parents 0172d50 + b42e878 commit dfb63ed
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License
#
# Copyright (c) 2015-2019, CloudBees, Inc. and other Jenkins contributors
# Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,7 +23,7 @@
FROM openjdk:8-jdk
MAINTAINER Oleg Nenashev <[email protected]>

ARG VERSION=3.36
ARG VERSION=3.40
ARG user=jenkins
ARG group=jenkins
ARG uid=1000
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-alpine
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License
#
# Copyright (c) 2015-2019, CloudBees, Inc. and other Jenkins contributors
# Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,7 +23,7 @@
FROM openjdk:8-jdk-alpine
MAINTAINER Oleg Nenashev <[email protected]>

ARG VERSION=3.36
ARG VERSION=3.40
ARG user=jenkins
ARG group=jenkins
ARG uid=1000
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-jdk11
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License
#
# Copyright (c) 2015-2019, CloudBees, Inc. and other Jenkins contributors
# Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,7 +23,7 @@
FROM openjdk:11-jdk
MAINTAINER Oleg Nenashev <[email protected]>

ARG VERSION=3.36
ARG VERSION=3.40
ARG user=jenkins
ARG group=jenkins
ARG uid=1000
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-windows
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The MIT License
#
# Copyright (c) 2019, Alex Earl and other Jenkins Contributors
# Copyright (c) 2019-2020, Alex Earl and other Jenkins Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -29,7 +29,7 @@ MAINTAINER Alex Earl <[email protected]>

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ARG VERSION=3.36
ARG VERSION=3.40
LABEL Description="This is a base image, which provides the Jenkins agent executable (agent.jar)" Vendor="Jenkins project" Version="${VERSION}"

ARG GIT_VERSION=2.24.0
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-windows-jdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The MIT License
#
# Copyright (c) 2019, Alex Earl and other Jenkins Contributors
# Copyright (c) 2020, Alex Earl and other Jenkins Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -29,7 +29,7 @@ MAINTAINER Alex Earl <[email protected]>

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ARG VERSION=3.36
ARG VERSION=3.40
LABEL Description="This is a base image, which provides the Jenkins agent executable (agent.jar)" Vendor="Jenkins project" Version="${VERSION}"

ARG GIT_VERSION=2.24.0
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-windows-nanoserver
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The MIT License
#
# Copyright (c) 2019, Alex Earl and other Jenkins Contributors
# Copyright (c) 2019-2020, Alex Earl and other Jenkins Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -63,7 +63,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
Remove-Item mingit.zip -Force ; `
setx /M PATH $('c:\mingit\cmd;{0}' -f $env:PATH)

ARG VERSION=3.36
ARG VERSION=3.40
ARG user=jenkins

ARG AGENT_FILENAME=agent.jar
Expand Down Expand Up @@ -92,4 +92,4 @@ RUN mkdir (Join-Path $env:AGENT_ROOT .jenkins) | Out-Null ; `

VOLUME ${AGENT_ROOT}/.jenkins
VOLUME ${AGENT_WORKDIR}
WORKDIR ${AGENT_ROOT}
WORKDIR ${AGENT_ROOT}
6 changes: 3 additions & 3 deletions Dockerfile-windows-nanoserver-jdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The MIT License
#
# Copyright (c) 2019, Alex Earl and other Jenkins Contributors
# Copyright (c) 2020, Alex Earl and other Jenkins Contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -63,7 +63,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
Remove-Item mingit.zip -Force ; `
setx /M PATH $('c:\mingit\cmd;{0}' -f $env:PATH)

ARG VERSION=3.36
ARG VERSION=3.40
ARG user=jenkins

ARG AGENT_FILENAME=agent.jar
Expand Down Expand Up @@ -92,4 +92,4 @@ RUN mkdir (Join-Path $env:AGENT_ROOT .jenkins) | Out-Null ; `

VOLUME ${AGENT_ROOT}/.jenkins
VOLUME ${AGENT_WORKDIR}
WORKDIR ${AGENT_ROOT}
WORKDIR ${AGENT_ROOT}
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2015-2019 Jenkins project contributors
Copyright (c) 2015-2020 Jenkins project contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit dfb63ed

Please sign in to comment.