summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2020-11-25 18:27:58 +0100
committerFlorian Dold <florian@dold.me>2020-11-25 18:27:58 +0100
commitf2bbe872cf9e668045bca8f8df604d4298f4f475 (patch)
tree02272b157a928116e7efbe3cf17eb1499aa0bd92
parentf3842bc5fb38e9e87cc6eee0cf84797b1b6022c4 (diff)
downloadwallet-core-f2bbe872cf9e668045bca8f8df604d4298f4f475.tar.gz
wallet-core-f2bbe872cf9e668045bca8f8df604d4298f4f475.tar.bz2
wallet-core-f2bbe872cf9e668045bca8f8df604d4298f4f475.zip
better docker instructions
-rw-r--r--README25
-rw-r--r--packages/taler-wallet-webextension/.gitignore2
-rwxr-xr-xpackages/taler-wallet-webextension/pack.sh4
3 files changed, 23 insertions, 8 deletions
diff --git a/README b/README
index 0a1600234..577c0a3a3 100644
--- a/README
+++ b/README
@@ -32,24 +32,37 @@ The WebExtension can be built via the 'webextension' make target:
./configure && make webextension
```
-This will create the zip file with the WebExtension in the location
+This will create the zip file with the WebExtension in the directory
```
-packages/taler-wallet-webextension/taler-wallet-webextension-$VERSION.zip
+packages/taler-wallet-webextension/extension/
```
We also provide a `Dockerfile` for a container that can build the WebExtension:
```shell
+# Download wallet source code and unpack it
+(host)$ tar -xf wallet-core-$version.tar.gz
+
# Build the image
-(host)$ docker build --tag walletbuilder contrib/wallet-docker
+(host)$ docker build --tag walletbuilder wallet-core-$version/contrib/wallet-docker
+
+# Start the container
+(host)$ docker run -dti --name walletcontainer walletbuilder /bin/bash
-# Run container with wallet source mounted
-(host)$ docker run -it -v $PWD:/wallet-core walletbuilder
+# Copy wallet source to container
+(host)$ docker cp ./wallet-core-$version/ walletcontainer:/
+
+# Attach to container
+(host)$ docker attach walletcontainer
# Run build inside container
-(container)$ cd wallet-core
+(container)$ cd wallet-core-$version
(container)$ ./configure && make webextension
+(container)$ exit
+
+# Copy build artefact(s) to host
+(host)$ docker cp walletcontainer:/wallet-core-$version/packages/taler-wallet-webextension/extension extension
```
diff --git a/packages/taler-wallet-webextension/.gitignore b/packages/taler-wallet-webextension/.gitignore
index a6178770e..076e5515d 100644
--- a/packages/taler-wallet-webextension/.gitignore
+++ b/packages/taler-wallet-webextension/.gitignore
@@ -1 +1 @@
-taler-wallet-*.zip
+extension/
diff --git a/packages/taler-wallet-webextension/pack.sh b/packages/taler-wallet-webextension/pack.sh
index 48ec522dc..df8d9d54b 100755
--- a/packages/taler-wallet-webextension/pack.sh
+++ b/packages/taler-wallet-webextension/pack.sh
@@ -17,5 +17,7 @@ cp -r dist static tmp/
cd tmp
zip -r "$zipfile" dist static manifest.json
cd ..
-mv "./tmp/$zipfile" ./
+mkdir -p extension
+mv "./tmp/$zipfile" ./extension/
rm -rf tmp
+echo "Packed webextension: extension/$zipfile"