Skip to content

Misc custom docker #178

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

Open
dannys42 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Misc custom docker #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
227ddf9
Travis: Include test for private doker registery
dannys42 Mar 13, 2021
f6da639
Travis: fix docker login
dannys42 Mar 13, 2021
3cd8665
Update check for docker login credentials; emit error if missing
dannys42 Mar 13, 2021
3574eaf
fix typo
dannys42 Mar 13, 2021
30a76b8
Remove private docker login requirement
dannys42 Mar 13, 2021
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
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ matrix:
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=5.1
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 SWIFT_SNAPSHOT=5.3.3
- os: linux
dist: xenial
sudo: required
Expand Down
4 changes: 0 additions & 4 deletions build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ function travis_end () {
# Additional packages can be installed by listing them in DOCKER_PACKAGES.
#
if [ -n "${DOCKER_IMAGE}" ]; then
if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}"
fi

echo ">> Executing build in Docker container: ${DOCKER_IMAGE}"
# Check if privileged mode has been requested for
if [ -n "${DOCKER_PRIVILEGED}" ]; then
Expand Down