Merge pull request #184 from oleg-nenashev/update/4.3-6

Update the base image to 4.3-6 + Windows images: Fix password expiration issue in the base images
jenkinsci · Jul 17, 2020 · 259a195 · 259a195
2 parents 98527ae + c1269df
commit 259a195
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-4-jdk11
+ARG version=4.3-6-jdk11
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/11/nanoserver-1809/Dockerfile b/11/nanoserver-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-4
+ARG VERSION=4.3-6
 FROM jenkins/agent:${VERSION}-jdk11-nanoserver-1809
 
 ARG VERSION

diff --git a/11/windowsservercore-1809/Dockerfile b/11/windowsservercore-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-4
+ARG VERSION=4.3-6
 FROM jenkins/agent:${VERSION}-jdk11-windowsservercore-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-4-alpine
+ARG version=4.3-6-alpine
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/8/debian/Dockerfile b/8/debian/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.3-4
+ARG version=4.3-6
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/8/nanoserver-1809/Dockerfile b/8/nanoserver-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-4
+ARG VERSION=4.3-6
 FROM jenkins/agent:${VERSION}-nanoserver-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/8/windowsservercore-1809/Dockerfile b/8/windowsservercore-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.3-4
+ARG VERSION=4.3-6
 FROM jenkins/agent:${VERSION}-windowsservercore-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"