Upgrade vagga.yaml to use new compiler

Author: tailhook

vagga.yaml

@@ -7,7 +7,7 @@ commands:
 
   make-wasm: !Command
     description: Build wasm library (just to check it's buildable)
-    container: wasm
+    container: ubuntu
     run: [cargo, build, --target=wasm32-unknown-unknown]
 
   cargo: !Command
@@ -34,9 +34,12 @@ containers:
     - !Install [ca-certificates, git, build-essential, vim]
 
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-1.38.0-x86_64-unknown-linux-gnu.tar.gz"
       script: "./install.sh --prefix=/usr \
                 --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
+    - !TarInstall
+      url: "https://static.rust-lang.org/dist/rust-std-1.38.0-wasm32-unknown-unknown.tar.gz"
+      script: "./install.sh --prefix=/usr --components=rust-std-wasm32-unknown-unknown"
     - &bulk !Tar
       url: "https://github.com/tailhook/bulk/releases/download/v0.4.10/bulk-v0.4.10.tar.gz"
       sha256: 481513f8a0306a9857d045497fb5b50b50a51e9ff748909ecf7d2bda1de275ab
@@ -45,20 +48,3 @@ containers:
     environ:
       HOME: /work/target
       RUST_BACKTRACE: 1
-
-  wasm:
-    environ: &rustenv
-      PATH: /usr/local/bin:/usr/bin:/bin
-      HOME: /work/target
-      RUST_BACKTRACE: 1
-    setup:
-    - !Ubuntu xenial
-    - !UbuntuUniverse
-    - &pkgs !Install [build-essential, ca-certificates, vim]
-    - &rust !TarInstall
-      url: https://static.rust-lang.org/dist/rust-beta-x86_64-unknown-linux-gnu.tar.gz
-      script: "./install.sh --prefix=/usr --components=rustc,cargo \
-               --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
-    - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-std-beta-wasm32-unknown-unknown.tar.gz"
-      script: "./install.sh --prefix=/usr --components=rust-std-wasm32-unknown-unknown"