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

Manifest file path #107

Merged
merged 2 commits into from
Jul 29, 2019
Merged

Manifest file path #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d6b7a
Manifest file path
Jul 29, 2019
a944e5d
Wheel file needed by jenkins ci
Jul 29, 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
2 changes: 2 additions & 0 deletions .ci/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ function _main
# builds x86 and arm images based on manifest files
if [[ ! -z ${BUILD_TAG} ]]
then

GIT_MANIFEST_BRANCH=refs/tags/gateway/${BUILD_TAG}

_build "${DOCKERFILE_PATH}/stable/arm/docker-compose.yml" "arm" "--no-cache"
_build "${DOCKERFILE_PATH}/stable/x86/docker-compose.yml" "x86" "--no-cache"
else
Expand Down
2 changes: 1 addition & 1 deletion container/stable/arm/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
DOCKER_BASE: wirepas/base:1.1-raspbian
CROSS_BUILD_START_CMD: cross-build-start
CROSS_BUILD_END_CMD: cross-build-end
GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway.xml/stable.xml}
GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml}
GIT_MANIFEST_URL: ${GIT_MANIFEST_URL:-https://github.com/wirepas/manifest.git}
GIT_MANIFEST_BRANCH: ${GIT_MANIFEST_BRANCH:-master}

Expand Down
2 changes: 1 addition & 1 deletion container/stable/x86/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
DOCKER_BASE: wirepas/base:1.1-ubuntu
CROSS_BUILD_START_CMD: ":"
CROSS_BUILD_END_CMD: ":"
GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway.xml/stable.xml}
GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml}
GIT_MANIFEST_URL: ${GIT_MANIFEST_URL:-https://github.com/wirepas/manifest.git}
GIT_MANIFEST_BRANCH: ${GIT_MANIFEST_BRANCH:-master}

Expand Down