Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
7cd04db1
Commit
7cd04db1
authored
Mar 21, 2016
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Docker.mk to be compatible with Mac OS X
ECOM-3895
parent
211b49be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
docker.mk
+5
-5
No files found.
docker.mk
View file @
7cd04db1
...
...
@@ -26,7 +26,7 @@ pkg: docker.pkg
clean
:
rm
-rf
.build
docker.test.shard
:
$(foreach image
,
$(shell echo $(images) | tr ' ' '
\n
' |
sed -n '$(SHARD)~$(SHARDS)p
')
,
$(docker_test)$(image))
docker.test.shard
:
$(foreach image
,
$(shell echo $(images) | tr ' ' '
\n
' |
awk 'NR%$(SHARDS)==$(SHARD)
')
,
$(docker_test)$(image))
docker.build
:
$(foreach image
,
$(images)
,
$(docker_build)$(image))
docker.test
:
$(foreach image
,
$(images)
,
$(docker_test)$(image))
...
...
@@ -52,8 +52,8 @@ $(docker_push)%: $(docker_pkg)%
.build/%/Dockerfile.d
:
docker/build/%/Dockerfile Makefile
@
mkdir
-p
.build/
$*
$
(
eval
FROM
=
$(
shell
grep
"^
\s
*FROM"
$<
| sed
-
-regexp-extended
"s/FROM //"
| sed
--regexp-extended
"s/:/@/g"
)
)
$
(
eval
EDXOPS_FROM
=
$(
shell
echo
"
$(FROM)
"
| sed
-
-regexp-extended
"s#edxops/([^@]+
)
(@.*
)
?#
\1
#"
)
)
$
(
eval
FROM
=
$(
shell
grep
"^
\s
*FROM"
$<
| sed
-
E
"s/FROM //"
| sed
-E
"s/:/@/g"
)
)
$
(
eval
EDXOPS_FROM
=
$(
shell
echo
"
$(FROM)
"
| sed
-
E
"s#edxops/([^@]+
)
(@.*
)
?#
\1
#"
)
)
@
echo
"
$(docker_build)$*
:
$(docker_pull)$(FROM)
"
>
$@
@
if
[
"
$(EDXOPS_FROM)
"
!=
"
$(FROM)
"
]
;
then
\
echo
"
$(docker_test)$*
:
$(docker_test)
$
(EDXOPS_FROM:@%=)"
>>
$@
;
\
...
...
@@ -65,10 +65,10 @@ $(docker_push)%: $(docker_pkg)%
.build/%/Dockerfile.test
:
docker/build/%/Dockerfile Makefile
@
mkdir
-p
.build/
$*
@
sed
-
-regexp-extended
"s#FROM edxops/([^:]+)(:
\S
*)?#FROM
\1
:test#"
$<
>
$@
@
sed
-
E
"s#FROM edxops/([^:]+)(:
\S
*)?#FROM
\1
:test#"
$<
>
$@
.build/%/Dockerfile.pkg
:
docker/build/%/Dockerfile Makefile
@
mkdir
-p
.build/
$*
@
sed
-
-regexp-extended
"s#FROM edxops/([^:]+)(:
\S
*)?#FROM
\1
:test#"
$<
>
$@
@
sed
-
E
"s#FROM edxops/([^:]+)(:
\S
*)?#FROM
\1
:test#"
$<
>
$@
-include
$(foreach
image,$(images),.build/$(image)/Dockerfile.d)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment