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

Integrate the alpine image into the master branch #112

Merged
merged 33 commits into from
Sep 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
336f004
Migrate image to alpine to save disk space
RostyslavFridman Jun 13, 2016
471df3d
Merge branch 'master' into alpine
carlossg Aug 20, 2016
196227d
Install bash
carlossg Aug 20, 2016
ad22928
We probably want git installed too
carlossg Aug 21, 2016
499deb7
Merge branch 'master' into alpine
carlossg Sep 2, 2016
3d4532e
Merge branch 'master' into alpine
carlossg Sep 5, 2016
67adaed
/home/jenkins/.jenkins volume must be owned by junking user
ndeloof Sep 7, 2016
0c3958b
Merge branch 'readme' into alpine
oleg-nenashev Mar 16, 2017
1c9dfc6
Use the alpine image of jenkinsci/slave in the alpine builds
oleg-nenashev Mar 16, 2017
a3f6f42
REadme: Fix typo noticed by @jglick
oleg-nenashev Mar 17, 2017
5e5623f
Merge pull request #27 from oleg-nenashev/alpine
oleg-nenashev Mar 27, 2017
56e7095
Merge pull request #29 from jenkinsci/master
oleg-nenashev Mar 27, 2017
1ecabc7
Merge branch 'master' into alpine
oleg-nenashev Apr 10, 2017
cb79dbc
Merge branch 'master' into alpine
oleg-nenashev Aug 4, 2017
dab7c9b
Merge branch 'master' into alpine
oleg-nenashev Nov 15, 2017
597aecd
Merge branch 'master' into alpine
oleg-nenashev Dec 26, 2017
a67089c
Merge branch 'master' into alpine
oleg-nenashev Jan 10, 2018
6305bd6
Merge branch 'master' into alpine
oleg-nenashev Mar 22, 2018
f704634
Remoting 3.20
carlossg Aug 2, 2018
38e1e9d
Remoting 3.23
carlossg Aug 2, 2018
9ded0f9
Merge pull request #67 from jenkinsci/remoting-3.20-alpine
oleg-nenashev Aug 2, 2018
0895a00
Fix typo
carlossg Aug 2, 2018
0a02392
Update Remoting to 3.26
carlossg Sep 22, 2018
d3d98d0
Merge branch 'master' into alpine
oleg-nenashev Oct 31, 2018
bc9b3b3
Use jenkins/slave:alpine as base for jenkins/jnlp-slave:alpine (fixes…
evermind-micw Mar 11, 2019
7232646
Merge pull request #80 from micw/alpine
oleg-nenashev Mar 11, 2019
fe652e8
Merge branch 'master' into alpine
oleg-nenashev May 31, 2019
86cd7b8
Alpine: Update to the 3.35-1 base image and to Remoting 3.35
oleg-nenashev Sep 20, 2019
648df74
Merge pull request #101 from jenkinsci/3.35-1-alpine
oleg-nenashev Sep 20, 2019
b96fdb4
[JENKINS-42846] - Update the base image to 3.35-2-alpine to fix the b…
oleg-nenashev Sep 20, 2019
8b50bfd
Merge pull request #109 from jenkinsci/upd/3.35-2-alpine
oleg-nenashev Sep 20, 2019
4385a93
#103 - Integrate the alpine branch into the master
oleg-nenashev Sep 20, 2019
ec98d00
Merge branch 'master' into alpine-to-master
oleg-nenashev Sep 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# The MIT License
#
# Copyright (c) 2015-2017, CloudBees, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

FROM jenkins/slave:3.35-2-alpine
MAINTAINER Oleg Nenashev <o.v.nenashev@gmail.com>
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.35-2"

COPY jenkins-slave /usr/local/bin/jenkins-slave

ENTRYPOINT ["jenkins-slave"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Optional environment variables:
### Enabled JNLP protocols

By default, the [JNLP3-connect](https://github.com/jenkinsci/remoting/blob/master/docs/protocols.md#jnlp3-connect) is disabled due to the known stability and scalability issues.
You can enable this protocol on your own risk using the
You can enable this protocol at your own risk using the
`JNLP_PROTOCOL_OPTS=-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=false` property (the protocol should be enabled on the master side as well).

In Jenkins versions starting from `2.27` there is a [JNLP4-connect](https://github.com/jenkinsci/remoting/blob/master/docs/protocols.md#jnlp4-connect) protocol.
Expand Down