prepare for release 0.14.0

hashtopolis · Jun 9, 2023 · 0af7193 · 0af7193
1 parent 46a8c26
commit 0af7193
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,4 +1,14 @@
-# v0.13.1 -> v0.x.x
+# v0.13.1 -> v0.14.0
+
+## Tech Preview New API
+Release 0.14.0 comes with a tech preview of APIv2. This is the starting point of the seperating of the frontend and the backend and gives 
+insight into what the future brings for Hashtopolis. We invite you to test it with the new web-ui and provide us with feedback. Be aware, 
+it is a preview, it contains bugs and it will change; also it does not contain any permission checking. To use it, please see 
+https://github.com/hashtopolis/server/wiki/Installation.
+
+## Default installation method changed to Dockerimage
+With the release 0.14.0 the default installation method changed to Docker. Docker images are now available at https://hub.docker.com/hashtopolis
+
 ## Bugfixes
 - Setting 'Salt is in hex' during Hashlist creation will not set the --hex-salt flag (#892)
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,8 @@
 version: '3.7'
 services:
-  hashtopolis-server:
-    container_name: hashtopolis-server
-    build:
-      context: .
-      target: hashtopolis-server-prod
-      args:
-        - CONTAINER_USER_CMD_PRE
-        - CONTAINER_USER_CMD_POST
+  hashtopolis-backend:
+    container_name: hashtopolis-backend
+    image: hashtopolis/backend:latest
     restart: always
     volumes:
       - hashtopolis:/usr/local/share/hashtopolis:Z
@@ -18,6 +13,7 @@ services:
       HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE
       HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER
       HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD
+      HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE
     depends_on:
       - db
     ports:
@@ -33,12 +29,12 @@ services:
       MYSQL_DATABASE: $MYSQL_DATABASE
       MYSQL_USER: $MYSQL_USER
       MYSQL_PASSWORD: $MYSQL_PASSWORD
-  hashtopolis-web-ui:
-    container_name: hashtopolis-web-ui
-    image: hashtopolis-web-ui:latest
+  hashtopolis-frontend:
+    container_name: hashtopolis-frontend
+    image: hashtopolis/frontend:latest
     restart: always
     depends_on: 
-      - hashtopolis-server
+      - hashtopolis-backend
     ports:
       - 4200:4200
 volumes:

diff --git a/env.example b/env.example
@@ -5,4 +5,6 @@ MYSQL_PASSWORD=hashtopolis
 
 HASHTOPOLIS_ADMIN_USER=admin
 HASHTOPOLIS_ADMIN_PASSWORD=hashtopolis
-HASHTOPOLIS_DB_HOST=db
+HASHTOPOLIS_DB_HOST=db
+
+HASHTOPOLIS_APIV2_ENABLE=0
diff --git a/src/api/v2/index.php b/src/api/v2/index.php
@@ -1,6 +1,11 @@
 <?php
 declare(strict_types=1);
 
+$enabled = getenv('HASHTOPOLIS_APIV2_ENABLE');
+if (!$enabled || $enabled == 'false') {
+  die("APIv2 is not enabled, it can be enabled via environment variable!");
+}
+
 date_default_timezone_set("UTC");
 error_reporting(E_ALL);
 ini_set("display_errors", '1');

diff --git a/src/inc/info.php b/src/inc/info.php
@@ -1,8 +1,8 @@
 <?php
 
-$VERSION = "0.13.1";
+$VERSION = "0.14.0";
 $BUILD = "repository";
 $HOST = @$_SERVER['HTTP_HOST'];
 if (strpos($HOST, ":") !== false) {
   $HOST = substr($HOST, 0, strpos($HOST, ":"));
-}
+}