Skip to content

Commit

Permalink
cleanup default circle env to see if space is an issue
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed Jun 24, 2017
1 parent bfb9722 commit 87ddda5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ src/examples/using-with-make/example
.ipynb_checkpoints
visitlog.py
uberenv_libs
conduit.docker.src.tar
conduit.docker.src.tar.gz
Testing/
7 changes: 7 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
machine:
pre:
- sudo rm -rf /usr/local/android-sdk-linux
- sudo rm -rf /usr/local/go
- sudo rm -rf /usr/local/android-ndk
- sudo rm -rf /home/ubuntu/nvm
- sudo rm -rf /home/ubuntu/.android

services:
- docker

Expand Down
6 changes: 1 addition & 5 deletions package.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ def create_package(output_file=None):
suffix = "tar";
t = datetime.datetime.now()
output_file = "%s.%04d.%02d.%02d.%s" % (repo_name,t.year,t.month,t.day,suffix)
if output_file.endswith(".gz"):
output_file = output_file[:-3]
cmd = "git archive --format=tar --prefix=%s/ HEAD > %s; " % (repo_name,output_file)
cmd += "cd ../; tar -rf %s/%s %s/.git; cd %s; " % (repo_name,output_file,repo_name,repo_name)
cmd += "gzip %s; " % output_file
cmd = "git archive --format=tar --prefix=%s/ HEAD > %s " % (repo_name,output_file)
print "[exe: %s]" % cmd
subprocess.call(cmd,shell=True)

Expand Down
4 changes: 2 additions & 2 deletions src/examples/docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ RUN apt-get update && apt-get install -y \


# untar the current source (created as part of example_build.sh)
COPY conduit.docker.src.tar.gz /
RUN tar -xzf conduit.docker.src.tar.gz
COPY conduit.docker.src.tar /
RUN tar -xf conduit.docker.src.tar

# if you would like to clone conduit master directly, you can use:
#RUN git clone --depth 1 https://github.com/LLNL/conduit.git
Expand Down
4 changes: 2 additions & 2 deletions src/examples/docker/ubuntu/example_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ echo "rm -f conduit.docker.src.tar.gz"
rm -f conduit.docker.src.tar.gz

# get current copy of the conduit source
echo "cd ../../../../ && python package.py src/examples/docker/ubuntu/conduit.docker.src.tar.gz"
cd ../../../../ && python package.py src/examples/docker/ubuntu/conduit.docker.src.tar.gz
echo "cd ../../../../ && python package.py src/examples/docker/ubuntu/conduit.docker.src.tar"
cd ../../../../ && python package.py src/examples/docker/ubuntu/conduit.docker.src.tar

# change back to the dir with our Dockerfile
echo "cd src/examples/docker/ubuntu/"
Expand Down

0 comments on commit 87ddda5

Please sign in to comment.