Merge branch 'develop'

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.3] - 2022-05-11
+* Update to v1.0.6 of the packages-cci Docker image (includes public
+  keys for 21.02)
+
 ## [0.1.2] - 2019-12-02
 * Update to v1.0.5 of the packages-cci Docker image (includes public
   keys for 19.07)
@@ -11,6 +15,6 @@
 * Initial release
 
 
-[Unreleased]: https://github.com/jefferyto/openwrt-vivarium/compare/0.1.2...develop
+[0.1.3]: https://github.com/jefferyto/openwrt-vivarium/compare/0.1.2...0.1.3
 [0.1.2]: https://github.com/jefferyto/openwrt-vivarium/compare/0.1.1...0.1.2
 [0.1.1]: https://github.com/jefferyto/openwrt-vivarium/compare/0.1.0...0.1.1

README.md

@@ -42,10 +42,10 @@ Testing with other platforms is welcome.
 
 ## Getting started
 
-1.  Download the source code ([zip][Vivarium zip] or
-    [tar.gz][Vivarium tar.gz]) and extract, e.g.:
+1.  Download the [latest release][Vivarium latest release] and extract,
+    e.g.:
 
-        $ unzip openwrt-vivarium-master.zip
+        $ unzip openwrt-vivarium-0.1.3.zip
 
     If you will be using Git to manage your package source code, then
     you will want to download Vivarium without Git to avoid nesting Git
@@ -55,7 +55,7 @@ Testing with other platforms is welcome.
     source code for packages, e.g. by checking out the OpenWrt packages
     feed:
 
-        $ cd openwrt-vivarium-master
+        $ cd openwrt-vivarium-0.1.3
         $ git clone https://github.com/openwrt/packages.git
 
 3.  If you are using Linux and your user ID is not 1000, you will need
@@ -100,8 +100,7 @@ During each builder run, these SDK commands:
 will be run before the command specified on the `docker-compose run`
 command line.
 
-[Vivarium zip]: https://github.com/jefferyto/openwrt-vivarium/archive/master.zip
-[Vivarium tar.gz]: https://github.com/jefferyto/openwrt-vivarium/archive/master.tar.gz
+[Vivarium latest release]: https://github.com/jefferyto/openwrt-vivarium/releases/latest
 
 ## Directory structure
 

builder/Dockerfile

@@ -18,7 +18,7 @@
 # along with Vivarium.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-FROM docker.io/openwrtorg/packages-cci:v1.0.5
+FROM docker.io/openwrtorg/packages-cci:v1.0.6
 
 ARG SDK_HOST
 ARG SDK_PATH