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

Conversation

oleg-nenashev
Copy link
Member

See jenkinsci/docker-agent#685 . This change integrates the base image into the master branch so that we can delete the alpine branch

RostyslavFridman and others added 30 commits August 16, 2016 09:53
Conflicts:
	Dockerfile
Align the Alpine build with the current master branch approach
# Conflicts:
#	Dockerfile
# Conflicts:
#	Dockerfile
# Conflicts:
#	Dockerfile
# Conflicts:
#	Dockerfile
Use jenkins/slave:alpine as base for jenkins/jnlp-slave:alpine
# Conflicts:
#	Dockerfile
Alpine: Update to the 3.35-1 base image and to Remoting 3.35
@oleg-nenashev oleg-nenashev merged commit 39f1543 into jenkinsci:master Sep 20, 2019
lemeurherve pushed a commit to lemeurherve/jenkinsci-docker-inbound-agent that referenced this pull request Nov 19, 2023
Let jenkins user's password in windows never expire.
lemeurherve pushed a commit to lemeurherve/docker-agent that referenced this pull request Nov 28, 2023
…eg-nenashev/alpine-to-master

Integrate the alpine image into the master branch
lemeurherve pushed a commit to lemeurherve/docker-agent that referenced this pull request Jan 12, 2024
…hev/alpine-to-master

Integrate the alpine image into the master branch
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants