Skip to content

Commit 192d2c9

Browse files
committed
bucket name needs to be from params
1 parent 79fc4de commit 192d2c9

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name="singularity",
88

99
# Version number:
10-
version="0.54",
10+
version="0.58",
1111

1212
# Application author details:
1313
author="Vanessa Sochat",

singularity/build/google.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def run_build(build_dir=None,spec_file=None,repo_url=None,token=None,size=None,b
232232

233233
# Start the storage service, retrieve the bucket
234234
storage_service = get_storage_service()
235-
bucket = get_bucket(storage_service,bucket_name)
235+
bucket = get_bucket(storage_service,params["bucket_name"])
236236

237237
# For each file, upload to storage
238238
files = []
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
#!/bin/sh
22
sudo apt-get update
3+
34
sudo apt-get -y install git
5+
46
sudo apt-get install -y build-essential libtool autotools-dev automake autoconf
7+
58
sudo apt-get install -y python3-pip
9+
610
cd /tmp && git clone http://www.github.com/singularityware/singularity
7-
cd singularity && ./autogen.sh && ./configure && make && sudo make install
8-
export SINGULARITY_VERSION=$(singularity --version)
11+
12+
cd /tmp/singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
13+
914
sudo pip3 install --upgrade pip
15+
1016
sudo pip3 install --upgrade google-api-python-client
17+
1118
sudo pip3 install --upgrade google
19+
1220
sudo pip3 install oauth2client==3.0.0
21+
1322
sudo pip3 install gitpython
23+
1424
sudo pip3 install singularity --upgrade
15-
sudo python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
25+
26+
python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
27+
1628
export command=$(echo "from singularity.build.google import finish_build; finish_build()")
17-
sudo python3 -c "$command"
29+
30+
python3 -c "$command"

0 commit comments

Comments
 (0)