Skip to content
This repository has been archived by the owner on Apr 23, 2022. It is now read-only.

Commit

Permalink
Merge pull request #25 from circleci/fix_broken_circleci_docker
Browse files Browse the repository at this point in the history
Fix broken circleci docker
  • Loading branch information
kimh committed Jan 4, 2016
2 parents 9a0d42d + 761b3e5 commit 78d7057
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN circleci-install docker_compose

# When running in unprivileged containers, need to use CircleCI Docker fork
ARG TARGET_UNPRIVILEGED_LXC
RUN if [ "n$TARGET_UNPRIVILEGED_LXC" = "ntrue" ]; then circleci-install circleci_docker; fi
RUN if [ "$TARGET_UNPRIVILEGED_LXC" = "true" ]; then circleci-install circleci_docker; fi

# Undivert upstart
RUN rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ test:
- docker push circleci/build-image:trusty-${IMAGE_TAG}

# Build a slightly modified image for unprivileged lxc
- docker build --build-arg TARGET_UNPRIVILEGED_LXC=yes -t circleci/build-image:scratch-unprivileged .:
- docker build --build-arg TARGET_UNPRIVILEGED_LXC=true -t circleci/build-image:scratch-unprivileged .:
timeout: 3600

- docker tag circleci/build-image:scratch circleci/build-image:trusty-${IMAGE_TAG}-unprivileged
- docker tag circleci/build-image:scratch-unprivileged circleci/build-image:trusty-${IMAGE_TAG}-unprivileged
- docker push circleci/build-image:scratch:
timeout: 3600
- docker push circleci/build-image:trusty-${IMAGE_TAG}-unprivileged
Expand Down

0 comments on commit 78d7057

Please sign in to comment.