Remove circleci in favour of Github Actions

.circleci/Docker/docker-commands.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-get_repository_root(){
-    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
-    echo "$REPOSITORY_ROOT"
-}
-
-get_repository_subdir(){
-    REPOSITORY_ROOT=$(get_repository_root)
-    CUR_DIR=$(pwd)
-    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
-    echo "$SUB_DIR"
-}
-
-docker-interactive() {
-    REPOSITORY_ROOT=$(get_repository_root)
-    SUB_DIR=$(get_repository_subdir)
-
-    echo "SUB_DIR: " "$SUB_DIR"
-
-    source $REPOSITORY_ROOT/.circleci/Docker/Docker.variables
-    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
-
-    echo "Got command: " "$*"
-    USER_ID=$(id -u $USER)
-    echo "Using USER_ID:" $USER_ID
-
-    docker run  --env LOCAL_USER_ID=$USER_ID \
-                --rm \
-                --interactive \
-                --volume $REPOSITORY_ROOT:/tmp/workspace \
-                --workdir /tmp/workspace$SUB_DIR \
-                --env "TERM=xterm-256color" \
-                --tty \
-                "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
-}
-
-docker-help() {
-    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
-    echo "docker-help            - Show this help text"
-}

.circleci/config.yml

@@ -1,15 +0,0 @@
----
-version: 2.0
-
-jobs:
-  "Tomahawk - build, test":
-    docker:
-      - image: tomahawkmusicplayer/ubuntu:latest
-    steps:
-      - checkout
-      - run: /usr/local/bin/build-and-test.sh
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - "Tomahawk - build, test"

Docker/docker-commands.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+get_repository_root(){
+    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
+    echo "$REPOSITORY_ROOT"
+}
+
+get_repository_subdir(){
+    REPOSITORY_ROOT=$(get_repository_root)
+    CUR_DIR=$(pwd)
+    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
+    echo "$SUB_DIR"
+}
+
+# Run commands inside docker container
+_docker_run() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+                --privileged \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" \
+				$*
+}
+
+# 1st command: Run make target inside docker
+docker-make() {
+    _docker_run make "${@}"
+}
+
+# 2nd command: Run bash command inside docker
+docker-run() {
+    _docker_run "${@}"
+}
+
+# 3rd command: Run bash interactive inside docker
+docker-interactive() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --interactive \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
+}
+
+docker-help() {
+    echo "docker-make            - Run a make target inside docker container"
+    echo "docker-run             - Run a specific bash command inside docker container and remove container on exit"
+    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
+    echo "docker-help            - Show this help text"
+}