Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create folder hierarchy #105

Merged
merged 15 commits into from
Apr 9, 2020
Merged

Create folder hierarchy #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fab9415
Created hierarchical folder structure based on openjdk-version/base-i…
Jan 17, 2020
9adf972
Cleaned code
Jan 18, 2020
9257b17
Merge branch 'add_test_and_uniform_code' into create_folder_hierarchy
Jan 18, 2020
5166cb8
Merge branch 'master' into create_folder_hierarchy
Jan 29, 2020
b5c923c
Improved make.ps1
Jan 29, 2020
79a2525
Improved Makefile
Jan 29, 2020
d553cca
Improved make.ps1
Jan 29, 2020
e49e7f7
Merge branch 'master' into create_folder_hierarchy
Jan 30, 2020
1daf41e
Replaced generic base image tags with more specific ones
Jan 30, 2020
906f72a
Added examples of tags
Feb 3, 2020
0a03116
Resolved confilcts
Mar 30, 2020
504aac5
Cleaned Makefiles
Mar 30, 2020
622bf51
#105 Updated code according to PR comments
Mar 31, 2020
3e5b00a
#105 Updated code according to PR comments
Apr 1, 2020
97557a6
#105 Updated code according to PR comments
Apr 1, 2020
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
0 11/windows/servercore-1809/Dockerfile → 11/windows/windowsservercore-1809/Dockerfile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8/alpine3.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

FROM openjdk:8-jdk-alpine3.9
krufab marked this conversation as resolved.
Show resolved Hide resolved
FROM openjdk:8-jdk-alpine
MAINTAINER Oleg Nenashev <o.v.nenashev@gmail.com>

ARG VERSION=4.3
Expand Down
0 8/windows/servercore-1809/Dockerfile → 8/windows/windowsservercore-1809/Dockerfile
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) {

$builds = @{
'jdk8' = @{
'Folder' = '8\windows\servercore-1809';
'Folder' = '8\windows\windowsservercore-1809';
krufab marked this conversation as resolved.
Show resolved Hide resolved
'Tags' = @( "latest", "windowsservercore-$WindowsTag", "jdk8", "windowsservercore-$WindowsTag-jdk8" )
};
'jdk11' = @{
'Folder' = '11\windows\servercore-1809';
'Folder' = '11\windows\windowsservercore-1809';
'Tags' = @( "windowsservercore-$WindowsTag-jdk11", "jdk11" )
};
'nanoserver' = @{
Expand Down
28 changes: 8 additions & 20 deletions tests/agent.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if([System.String]::IsNullOrWhiteSpace($FLAVOR)) {

Cleanup($AGENT_CONTAINER)

Describe "[$FLAVOR] build image" {
Describe "[$JDK $FLAVOR] build image" {
BeforeEach {
Push-Location -StackName 'agent' -Path "$PSScriptRoot/.."
}
Expand All @@ -45,21 +45,17 @@ Describe "[$FLAVOR] build image" {
}
}

Describe "[$FLAVOR] correct image metadata" {
Describe "[$JDK $FLAVOR] correct image metadata" {
It 'has correct volumes' {
$exitCode, $stdout, $stderr = Run-Program 'docker.exe' "inspect -f '{{.Config.Volumes}}' $AGENT_IMAGE"
$stdout | Should -Match 'C:/Users/jenkins/.jenkins'
$stdout | Should -Match 'C:/Users/jenkins/Work'
}
}

Describe "[$FLAVOR] image has correct applications in the PATH" {
Describe "[$JDK $FLAVOR] image has correct applications in the PATH" {
BeforeAll {
if($FOLDER.Contains('nanoserver')) {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" pwsh
} else {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" powershell
}
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" "$SHELL"
Is-AgentContainerRunning $AGENT_CONTAINER
}

Expand Down Expand Up @@ -92,13 +88,9 @@ Describe "[$FLAVOR] image has correct applications in the PATH" {
}
}

Describe "[$FLAVOR] check user access to directories" {
Describe "[$JDK $FLAVOR] check user access to directories" {
BeforeAll {
if($FOLDER.Contains('nanoserver')) {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" pwsh
} else {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" powershell
}
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" "$SHELL"
Is-AgentContainerRunning $AGENT_CONTAINER
}

Expand Down Expand Up @@ -126,18 +118,14 @@ $TEST_VERSION="3.36"
$TEST_USER="test-user"
$TEST_AGENT_WORKDIR="C:/test-user/something"

Describe "[$FLAVOR] use build args correctly" {
Describe "[$JDK $FLAVOR] use build args correctly" {
BeforeAll {
Push-Location -StackName 'agent' -Path "$PSScriptRoot/.."

$exitCode, $stdout, $stderr = Run-Program 'docker.exe' "build --build-arg `"VERSION=${TEST_VERSION}`" --build-arg `"user=${TEST_USER}`" --build-arg `"AGENT_WORKDIR=${TEST_AGENT_WORKDIR}`" -t ${AGENT_IMAGE} ${FOLDER}"
$exitCode | Should -Be 0

if($FOLDER.Contains('nanoserver')) {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" pwsh
} else {
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" powershell
}
docker run -d -it --name "$AGENT_CONTAINER" -P "$AGENT_IMAGE" "$SHELL"
Is-AgentContainerRunning $AGENT_CONTAINER
}

Expand Down