Merge pull request #562 from commons-stack/v0_11_1

V0 11 1
givepraise · Aug 24, 2022 · 35c2d63 · 35c2d63
2 parents 12e7835 + 65f6d44
commit 35c2d63
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/package-dev-frontend.yml b/.github/workflows/package-dev-frontend.yml
@@ -14,20 +14,12 @@ jobs:
       contents: read
       packages: write
 
-    steps:    
+    steps:
       - uses: actions/checkout@v2
         name: Check out code
 
-      - uses: martinbeentjes/npm-get-version-action@main
-        name: get-npm-version
-        id: package-version
-        with:
-          path: packages/frontend
-
       - uses: mr-smithers-excellent/docker-build-push@v5
         name: Build and push Docker image
-        env:
-          REACT_APP_VERSION: ${{ steps.package-version.outputs.current-version}}
         with:
           image: $IMAGE_NAME
           tags: latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [0.11.1] - 2022-08-24
+
+Hotfix resolving an issue with building Docker images for production.
+
 ## [0.11.0] - 2022-08-24
 
 ### Added

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "praise",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "description": "Praise community contributions to build a culture of giving and gratitude.",
   "private": true,

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "description": "The Praise REST API running on Node/Express, using MongoDB for storage.",
   "type": "commonjs",

diff --git a/packages/discord-bot/package.json b/packages/discord-bot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discord-bot",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "description": "The Praise Discord bot is the main way for users to interact with the Praise system.",
   "dependencies": {

diff --git a/packages/frontend/.env.template b/packages/frontend/.env.template
@@ -11,5 +11,3 @@ REACT_APP_SERVER_URL=https://localhost
 # Port number used when running frontend for development, outside of Docker
 PORT=3000
 
-# App version from package.json
-REACT_APP_VERSION=$npm_package_version
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "description": "The Praise dashboard built on React/Recoil/Tailwind CSS.",
   "private": true,

diff --git a/packages/frontend/src/index.tsx b/packages/frontend/src/index.tsx
@@ -31,7 +31,6 @@ const gnosisChain: Chain = {
   id: 100,
   name: 'Gnosis Chain',
   network: 'Gnosis Chain',
-  iconUrl: `${process.env.REACT_APP_SERVER_URL}/uploads/gnosischain_logo.png`,
   nativeCurrency: {
     decimals: 18,
     name: 'xDAI',

diff --git a/packages/frontend/src/model/app.ts b/packages/frontend/src/model/app.ts
@@ -32,7 +32,7 @@ interface PraiseAppVersion {
 
 export const usePraiseAppVersion = (): PraiseAppVersion => {
   const appVersion: PraiseAppVersion = {
-    current: process.env.REACT_APP_VERSION,
+    current: 'v0.11.1', //TODO: get this from package.json
     latest: undefined,
     newVersionAvailable: false,
   };

diff --git a/packages/mongodb/package.json b/packages/mongodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "description": "The Prasie data is stored in a MongoDb database."
 }
diff --git a/packages/setup/package.json b/packages/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "GPL-3.0-or-later",
   "type": "commonjs",
   "description": "Praise ENV setup scripts.",