From 10eef7db148a57fb8450d73cb1bc1c73e8132f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Viitam=C3=A4ki?=
 <markus.viitamaki@embark-studios.com>
Date: Tue, 27 Jul 2021 09:30:47 +0200
Subject: [PATCH] Release 1.2.1 (#139)

* Fix release tag to work for dockerhub builds

* Bumping version to 1.2.1
---
 .github/workflows/release.yaml | 24 ++++++++++++++----------
 CHANGELOG.md                   |  7 ++++++-
 README.md                      |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fa78fbf..1b91df8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,9 +13,6 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -28,6 +25,12 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set environment variable for version tag
+        run: echo "WG-UI-VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
@@ -35,7 +38,7 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: embarkstudios/wireguard-ui:${GITHUB_REF#refs/tags/v}
+          tags: embarkstudios/wireguard-ui:${{ env.WG-UI-VERSION }}
 
       - name: Clear
         if: always()
@@ -47,22 +50,23 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-
     - name: Setup NodeJS
       uses: actions/setup-node@v2
       with:
         node-verison: 12
 
-    - name: npm install & build
-      run: |
-        make ui
-
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
         go-version: 1.16.x
 
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Build UI
+      run: |
+        make ui
+
     - name: Build wg-ui for Linux (AMD64)
       run: |
         name=wg-ui
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b799a0b..e6728cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 <!-- next-header -->
 ## [Unreleased]
 
+## [v1.2.1] - 2021-07-27
+### Fixes
+- [PR#139](https://github.com/EmbarkStudios/wg-ui/pull/139) Fix for versioned docker releases.
+
 ## [v1.2.0] - 2021-07-26
 ### Added
 - [PR#113](https://github.com/EmbarkStudios/wg-ui/pull/113) Adding AWS ALB-specific header for username. Thanks to [@justnom](https://github.com/justnom)!
@@ -38,7 +42,8 @@ All notable changes to this project will be documented in this file.
 - This is the initial release of wireguard-ui
 
 <!-- next-url -->
-[Unreleased]: https://github.com/EmbarkStudios/wg-ui/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/EmbarkStudios/wg-ui/compare/v1.2.1...HEAD
+[v1.2.1]: https://github.com/EmbarkStudios/wg-ui/compare/v1.2.0...v1.2.1
 [v1.2.0]: https://github.com/EmbarkStudios/wg-ui/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/EmbarkStudios/wg-ui/compare/v1.0.0...v1.1.0
 [v1.0.0]: https://github.com/EmbarkStudios/wg-ui/releases/tag/v1.0.0
diff --git a/README.md b/README.md
index 98f1852..4a6d35a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
 
 A basic, self-contained management service for [WireGuard](https://wireguard.com) with a self-serve web UI.  
-Current stable release: [v1.1.0](https://github.com/EmbarkStudios/wg-ui/releases/tag/v1.1.0)  
+Current stable release: [v1.2.1](https://github.com/EmbarkStudios/wg-ui/releases/tag/v1.2.1)  
 
 ## Features