Skip to content

Commit

Permalink
circleci: switch to using the new docker images
Browse files Browse the repository at this point in the history
In order to improve build time for the case where the docker image is
not cached on the current container we split the docker image into
multiple smaller ones.

Also, the images are now generated from the LKL docker hub
organization (https://hub.docker.com/r/lkldocker/) and the docker
files are stored in a separate gihub repo in the LKL github
organization (https://github.com/lkl).

Signed-off-by: Octavian Purdila <tavi@cs.pub.ro>
  • Loading branch information
tavip committed Nov 13, 2017
1 parent 8a316e3 commit 2a0c8e2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ do_steps: &do_steps
jobs:
x86_64:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci-x86_64:0.1
environment:
CROSS_COMPILE: ""
MKARG: "dpdk=yes"
Expand All @@ -86,15 +86,15 @@ jobs:

mingw32:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci-mingw:0.1
environment:
CROSS_COMPILE: "i686-w64-mingw32-"
LKL_TEST_DHCP: 1
<<: *do_steps

android-arm32:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci-android-arm32:0.1
environment:
CROSS_COMPILE: "arm-linux-androideabi-"
LKL_TEST_DHCP: 1
Expand All @@ -104,7 +104,7 @@ jobs:

android-aarch64:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci-android-arm64:0.1
environment:
CROSS_COMPILE: "aarch64-linux-android-"
LKL_TEST_DHCP: 1
Expand All @@ -114,7 +114,7 @@ jobs:

x86_64_valgrind:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci-x86_64:0.1
environment:
CROSS_COMPILE: ""
MKARG: "dpdk=yes"
Expand All @@ -124,7 +124,7 @@ jobs:

checkpatch:
docker:
- image: thehajime/lkl-docker:1.1
- image: lkldocker/circleci:0.1
environment:
steps:
- restore_cache:
Expand Down

0 comments on commit 2a0c8e2

Please sign in to comment.