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

Install Debian ca-certificates package #266

Merged
merged 3 commits into from
Jul 3, 2023
Merged

Install Debian ca-certificates package #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
783bf18
Update npm to 9.7.2
MarkEWaite Jul 3, 2023
4445562
Add failing test for issue 265
MarkEWaite Jul 3, 2023
db28575
Install ca-certificates Debian package
MarkEWaite Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ test-%: prepare-test
IMAGE=$* bats/bin/bats $(bats_flags) | tee target/results-$*.tap
# convert TAP to JUNIT
docker run --rm -v "$(CURDIR)":/usr/src/app -w /usr/src/app node:18-alpine \
sh -c "npm install -g npm@9.6.3 && npm install tap-xunit -g && cat target/results-$*.tap | tap-xunit --package='jenkinsci.docker.$*' > target/junit-results-$*.xml"
sh -c "npm install -g npm@9.7.2 && npm install tap-xunit -g && cat target/results-$*.tap | tap-xunit --package='jenkinsci.docker.$*' > target/junit-results-$*.xml"

test: prepare-test
@make --silent list | while read image; do make --silent "test-$${image}"; done
1 change: 1 addition & 0 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ RUN groupadd -g ${gid} ${group} \

RUN apt-get update \
&& apt-get install --no-install-recommends -y \
ca-certificates \
git-lfs \
less \
netcat-traditional \
Expand Down
5 changes: 4 additions & 1 deletion tests/tests.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ DOCKER_PLUGIN_DEFAULT_ARG="/usr/sbin/sshd -D -p 22"
assert_success
}

@test "[${SUT_IMAGE}] image has required tools installed and present in the PATH" {
@test "[${SUT_IMAGE}] image has required tools installed and present in the PATH and can clone agent repo" {
local test_container_name=${AGENT_CONTAINER}-bash-java
clean_test_container "${test_container_name}"
docker run --name="${test_container_name}" --name="${test_container_name}" "${docker_run_opts[@]}" "${PUBLIC_SSH_KEY}"
Expand All @@ -217,5 +217,8 @@ DOCKER_PLUGIN_DEFAULT_ARG="/usr/sbin/sshd -D -p 22"
run docker exec "${test_container_name}" patch --version
assert_success

run docker exec "${test_container_name}" git clone https://github.com/jenkinsci/docker-ssh-agent.git
assert_success

clean_test_container "${test_container_name}"
}