Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Docker Machine
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
Docker Machine
Commits
1642cfef
Unverified
Commit
1642cfef
authored
Jul 7, 2020
by
Pedro Pombeiro
Browse files
Options
Downloads
Patches
Plain Diff
Add support for linux/s390x
parent
e927003b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
.travis.yml
+1
-0
1 addition, 0 deletions
.travis.yml
Makefile.inc
+1
-1
1 addition, 1 deletion
Makefile.inc
mk/build.mk
+2
-1
2 additions, 1 deletion
mk/build.mk
with
6 additions
and
2 deletions
.gitlab-ci.yml
+
2
−
0
View file @
1642cfef
...
@@ -80,6 +80,7 @@ default:
...
@@ -80,6 +80,7 @@ default:
-
linux amd64
-
linux amd64
-
linux arm
-
linux arm
-
linux arm64
-
linux arm64
-
linux s390x
-
windows amd64
-
windows amd64
-
darwin amd64
-
darwin amd64
variables
:
variables
:
...
@@ -110,6 +111,7 @@ openbsd amd64: *build_x
...
@@ -110,6 +111,7 @@ openbsd amd64: *build_x
windows amd64
:
*build_x
windows amd64
:
*build_x
linux arm
:
*build_x
linux arm
:
*build_x
linux arm64
:
*build_x
linux arm64
:
*build_x
linux s390x
:
*build_x
release development S3
:
release development S3
:
extends
:
extends
:
...
...
This diff is collapsed.
Click to expand it.
.travis.yml
+
1
−
0
View file @
1642cfef
...
@@ -10,6 +10,7 @@ env:
...
@@ -10,6 +10,7 @@ env:
-
TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="build-x"
-
TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="build-x"
-
TARGET_OS=linux TARGET_ARCH=arm TARGETS="build-x"
-
TARGET_OS=linux TARGET_ARCH=arm TARGETS="build-x"
-
TARGET_OS=linux TARGET_ARCH=arm64 TARGETS="build-x"
-
TARGET_OS=linux TARGET_ARCH=arm64 TARGETS="build-x"
-
TARGET_OS=linux TARGET_ARCH=s390x TARGETS="build-x"
script
:
script
:
-
USE_CONTAINER=true make "$TARGETS"
-
USE_CONTAINER=true make "$TARGETS"
-
"
[[
\"
$(find
bin
-type
f
-name
docker-machine*)
\"
!=
\"\"
]]"
-
"
[[
\"
$(find
bin
-type
f
-name
docker-machine*)
\"
!=
\"\"
]]"
This diff is collapsed.
Click to expand it.
Makefile.inc
+
1
−
1
View file @
1642cfef
...
@@ -22,7 +22,7 @@ ifeq ($(TARGET_OS),)
...
@@ -22,7 +22,7 @@ ifeq ($(TARGET_OS),)
endif
endif
ifeq
($(TARGET_ARCH),)
ifeq
($(TARGET_ARCH),)
TARGET_ARCH
:=
amd64 arm arm64 386
TARGET_ARCH
:=
amd64 arm arm64
s390x
386
endif
endif
# Output prefix, defaults to local directory if not specified
# Output prefix, defaults to local directory if not specified
...
...
This diff is collapsed.
Click to expand it.
mk/build.mk
+
2
−
1
View file @
1642cfef
extension
=
$(
patsubst windows,.exe,
$(
filter windows,
$(
1
)))
extension
=
$(
patsubst windows,.exe,
$(
filter windows,
$(
1
)))
# Valid target combinations
# Valid target combinations
VALID_OS_ARCH
:=
"[darwin/amd64][linux/amd64][linux/arm][linux/arm64][openbsd/amd64][windows/amd64][windows/386]"
VALID_OS_ARCH
:=
"[darwin/amd64][linux/amd64][linux/arm][linux/arm64][
linux/s390x][
openbsd/amd64][windows/amd64][windows/386]"
os.darwin
:=
Darwin
os.darwin
:=
Darwin
os.linux
:=
Linux
os.linux
:=
Linux
...
@@ -11,6 +11,7 @@ os.windows := Windows
...
@@ -11,6 +11,7 @@ os.windows := Windows
arch.amd64
:=
x86_64
arch.amd64
:=
x86_64
arch.arm
:=
armhf
arch.arm
:=
armhf
arch.arm64
:=
aarch64
arch.arm64
:=
aarch64
arch.s390x
:=
s390x
arch.386
:=
i386
arch.386
:=
i386
define
gocross
define
gocross
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment