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
f7063355
Commit
f7063355
authored
Jun 15, 2018
by
isabelgk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Testing time to build go-server
parent
dc5de032
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
docker.mk
+4
-2
docker/build/go-server/docker-compose.yml
+0
-1
No files found.
docker.mk
View file @
f7063355
...
@@ -7,7 +7,7 @@ dockerfiles:=$(shell ls docker/build/*/Dockerfile)
...
@@ -7,7 +7,7 @@ dockerfiles:=$(shell ls docker/build/*/Dockerfile)
all_images
:=
$
(
patsubst docker/build/%/Dockerfile,%,
$(dockerfiles)
)
all_images
:=
$
(
patsubst docker/build/%/Dockerfile,%,
$(dockerfiles)
)
# Used in the test.mk file as well.
# Used in the test.mk file as well.
images
:=
$
(
if
$(TRAVIS_COMMIT_RANGE)
,
$(
shell
git diff
--name-only
$(TRAVIS_COMMIT_RANGE)
| python util/parsefiles.py
)
,
$(all_images)
)
images
:=
go-server
docker_build
=
docker.build.
docker_build
=
docker.build.
docker_test
=
docker.test.
docker_test
=
docker.test.
...
@@ -51,7 +51,7 @@ clean: docker.clean
...
@@ -51,7 +51,7 @@ clean: docker.clean
docker.clean
:
docker.clean
:
rm
-rf
.build
rm
-rf
.build
docker.test.shard
:
$(foreach image
,
$(shell echo $(images) |
python util/balancecontainers.py $(SHARDS)
| awk 'NR%$(SHARDS)==$(SHARD)')
,
$(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.build
:
$(foreach image
,
$(images)
,
$(docker_build)$(image))
docker.test
:
$(foreach image
,
$(images)
,
$(docker_test)$(image))
docker.test
:
$(foreach image
,
$(images)
,
$(docker_test)$(image))
...
@@ -65,7 +65,9 @@ $(docker_build)%: docker/build/%/Dockerfile
...
@@ -65,7 +65,9 @@ $(docker_build)%: docker/build/%/Dockerfile
docker build
-f
$<
.
docker build
-f
$<
.
$(docker_test)%
:
.build/%/Dockerfile.test
$(docker_test)%
:
.build/%/Dockerfile.test
date
docker build -t $*
:
test -f $< .
docker build -t $*
:
test -f $< .
date
$(docker_pkg)%
:
.build/%/Dockerfile.pkg
$(docker_pkg)%
:
.build/%/Dockerfile.pkg
docker build
-t
$*
:latest
-f
$<
.
docker build
-t
$*
:latest
-f
$<
.
...
...
docker/build/go-server/docker-compose.yml
View file @
f7063355
...
@@ -16,7 +16,6 @@ services:
...
@@ -16,7 +16,6 @@ services:
context
:
../../../.
context
:
../../../.
dockerfile
:
docker/build/go-agent/Dockerfile
dockerfile
:
docker/build/go-agent/Dockerfile
image
:
edxops/go-agent:latest
image
:
edxops/go-agent:latest
networks
:
networks
:
-
go-network
-
go-network
environment
:
environment
:
...
...
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