Release v1.3.0

Author: RomainVernoux

.circleci/config.yml

@@ -19,8 +19,8 @@ jobs:
           at: /home/circleci
       - restore_cache:
           keys:
-            - v3-front-dependencies-{{ checksum "front/package.json" }}
-            - v3-front-dependencies-
+            - v5-front-dependencies-{{ checksum "front/package.json" }}
+            - v5-front-dependencies-
       - run:
           working_directory: front
           name: Download dependencies
@@ -29,7 +29,11 @@ jobs:
           paths:
             - front/node_modules
             - /home/circleci/.cache/yarn/v6
-          key: v3-front-dependencies-{{ checksum "front/package.json" }}
+          key: v5-front-dependencies-{{ checksum "front/package.json" }}
+      - run:
+          working_directory: front
+          name: Run tests
+          command: yarn test
       - run:
           working_directory: front
           name: Build frontend
@@ -47,33 +51,36 @@ jobs:
           at: /home/circleci
       - restore_cache:
           keys:
-            - v3-back-dependencies-{{ checksum "go.sum" }}
-            - v3-back-dependencies-
+            - v4-back-dependencies-{{ checksum "back/go.sum" }}
+            - v4-back-dependencies-
       - run:
+          working_directory: back
           name: Run tests
           command: go test ./...
       - run:
+          working_directory: back
           name: Build backend
           command: |
+            cp -R ../front/build frontendBuild
             go install github.com/markbates/pkger/cmd/pkger && pkger
             export CGO_ENABLED=0
             go build karto
             GOOS=darwin GOARCH=amd64 go build -o karto_darwin
             GOOS=windows GOARCH=amd64 go build -o karto.exe
       - save_cache:
-          key: v3-back-dependencies-{{ checksum "go.sum" }}
+          key: v4-back-dependencies-{{ checksum "back/go.sum" }}
           paths:
             - /home/circleci/go/pkg/mod
       - store_artifacts:
-          path: karto
+          path: back/karto
       - store_artifacts:
-          path: karto_darwin
+          path: back/karto_darwin
       - store_artifacts:
-          path: karto.exe
+          path: back/karto.exe
       - persist_to_workspace:
           root: /home/circleci
           paths:
-            - karto/karto
+            - karto/back/karto
   dockerize-and-release:
     docker:
       - image: cimg/base:stable
@@ -87,16 +94,16 @@ jobs:
           command: |
             docker build -t zenikalabs/karto .
             docker tag zenikalabs/karto zenikalabs/karto:v1
-            docker tag zenikalabs/karto zenikalabs/karto:v1.2
-            docker tag zenikalabs/karto zenikalabs/karto:v1.2.1
+            docker tag zenikalabs/karto zenikalabs/karto:v1.3
+            docker tag zenikalabs/karto zenikalabs/karto:v1.3.0
       - run:
           name: Push docker image
           command: |
             echo "$DOCKER_PASS" | docker login --username $DOCKER_USER --password-stdin
             docker push zenikalabs/karto
             docker push zenikalabs/karto:v1
-            docker push zenikalabs/karto:v1.2
-            docker push zenikalabs/karto:v1.2.1
+            docker push zenikalabs/karto:v1.3
+            docker push zenikalabs/karto:v1.3.0
 workflows:
   version: 2
   build-test-and-deploy:

Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
 
-COPY ./karto /karto
+COPY ./back/karto /karto
 
 ENTRYPOINT ["/karto"]

README.md

@@ -90,23 +90,23 @@ The following tools must be available locally:
 
 ### Run the frontend in dev mode
 
-In the `front` folder, execute:
+In the `front` directory, execute:
 ```shell script
 npm start
 ```
 This will expose the app in dev mode on `localhost:3000` with a proxy to `localhost:8000` for the API calls.
 
 ### Run the backend locally
 
-Simply execute: 
+In the `back` directory, execute: 
 ```shell script
 go build karto
 ./karto
 ```
 
 ### Test suites
 
-To run the entire backend test suite: 
+To run the entire backend test suite, execute in the `back` directory: 
 ```shell script
 go test ./...
 ```
@@ -116,18 +116,19 @@ go test ./...
 In production mode, the frontend is packaged in the go binary using [pkger](https://github.com/markbates/pkger). In this
 configuration, the frontend is served on the `/` route and the API on the `/api` route.
 
-To compile the Karto binary from source, first compile the frontend source code. In the `front` folder, execute:
+To compile the Karto binary from source, first compile the frontend source code. In the `front` directory, execute:
 ```shell script
 npm run build
 ```
-This will generate a `build` folder in `/front`.
+This will generate a `build` directory in `front`.
 
 Then, package it inside the backend:
 ```shell script
+cp -R front/build back/frontendBuild
 go install github.com/markbates/pkger/cmd/pkger
 pkger
 ```
-This will generate a `pkged.go` file at the root with a binary content equivalent to the generated `build` folder.
+This will generate a `pkged.go` file in `back` with a binary content equivalent to the generated `build` directory.
 
 Finally, compile the go binary:
 ```shell script