added basic api call functionality

.github/workflows/featureRelease.yml

@@ -0,0 +1,37 @@
+name: Feature Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+     - 'featureWithPipeline/**'
+    paths:
+      - 'app/**'
+      - 'src/**'
+      - 'test/**'
+
+jobs:
+  Build_Docker_Image_on_Push:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Project
+        uses: actions/checkout@v2
+      -
+        name: Build Filehandler
+        run: |
+          stack build
+
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PW }}
+      -
+        name: Build and push
+        run: |
+          BINLOCATION=$(stack path --local-install-root)
+          BINLOCATION=$(realpath --relative-to=. $BINLOCATION)
+          docker build -t filefighter/filehandler:feature . --build-arg BINLOCATION=$BINLOCATION
+          docker push filefighter/filehandler:feature

.github/workflows/latestRelease.yml

@@ -0,0 +1,40 @@
+name: Latest Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches: "master"
+    paths:
+      - 'app/**'
+      - 'src/**'
+      - 'test/**'
+
+jobs:
+  Build_Docker_Image_on_Push:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Project
+        uses: actions/checkout@v2
+      -
+        name: Build Filehandler
+        run: |
+          stack build
+
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PW }}
+      -
+        name: Build and push
+        run: |
+          BINLOCATION=$(stack path --local-install-root)
+          BINLOCATION=$(realpath --relative-to=. $BINLOCATION)
+          docker build -t filefighter/filehandler:latest . --build-arg BINLOCATION=$BINLOCATION
+          docker push filefighter/filehandler:latest
+      -
+        name: Trigger update on server
+        run:
+          - curl -u ${{ secrets.LOG_CREDS }} https://logs.filefighter.de/filefighter-update.log

.github/workflows/stableRelease.yml

@@ -0,0 +1,34 @@
+name: Stable Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  Build_Docker_Image_on_Push:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Project
+        uses: actions/checkout@v2
+      -
+        name: Build Filehandler
+        run: |
+          stack build
+
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PW }}
+      -
+        name: Build and push
+        run: |
+          VERSION=${{ steps.vars.outputs.tag }}
+          BINLOCATION=$(stack path --local-install-root)
+          BINLOCATION=$(realpath --relative-to=. $BINLOCATION)
+          docker build -t filefighter/filehandler:$VERSION -t filefighter/filehandler:stable . --build-arg BINLOCATION=$BINLOCATION
+          docker push filefighter/filehandler:$VERSION
+          docker push filefighter/filehandler:stable

ChangeLog.md

@@ -0,0 +1,3 @@
+# Changelog for Filehandler
+
+## Unreleased changes

Dockerfile

@@ -1,33 +1,23 @@
-FROM ubuntu:16.04
+FROM ubuntu:latest
 
-# Get dumb-init to avoid Ctrl-C issues. See:
-# http://engineeringblog.yelp.com/2016/01/dumb-init-an-init-for-docker.html
-ADD https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 /usr/local/bin/dumb-init
-RUN chmod +x /usr/local/bin/dumb-init
+ARG BINLOCATION
+ENV RESTURL=FileFighterREST
+ENV PROFILE=prod
 
-# Set up Haskell Stack, the Haskell build tool.
-# Stack is the only dependency we have to run our application.
-# Once available, it will grab everything else we need
-# (compiler, libraries, etc).
-ADD https://get.haskellstack.org/get-stack.sh /usr/local/bin/
-RUN sh /usr/local/bin/get-stack.sh
+RUN apt-get update && apt-get upgrade -y
 
 # Copy over the source code and make it executable.
-COPY FileHandler.hs /usr/local/bin/file-handler
-RUN chmod +x /usr/local/bin/file-handler
+ADD $BINLOCATION/bin/Filehandler-exe /usr/local/bin/filehandler-exe
+RUN chmod +x /usr/local/bin/filehandler-exe
 
-# Create a new user account and directory to run from, and then
-# run everything else as that user.
-RUN useradd -m www && mkdir -p /workdir && chown www /workdir
-USER www
-
-# We run our application with "sanity" to force it to install all of
-# its dependencies during Docker image build time, making the Docker
-# image launch much faster.
-RUN /usr/local/bin/file-handler sanity
+# TODO: because we want to write to a host directory we must run as root, or change the permissions of the directory
+# create group and user, then the working dir and add permissions to it
+#RUN groupadd -g 999 appuser && useradd -r -u 999 -g appuser appuser && mkdir -p /workdir && chown appuser /workdir
+#USER appuser
 
 # We're all ready, now just configure our image to run the server on
 # launch from the correct working directory.
-CMD ["/usr/local/bin/dumb-init", "/usr/local/bin/file-handler"]
+# using exec solves ctl + c issues
+CMD exec /usr/local/bin/filehandler-exe ${RESTURL} $PROFILE
 WORKDIR /workdir
 EXPOSE 5000

Filehandler.cabal

@@ -0,0 +1,82 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.33.0.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 810c23ddfee0d410c3632560ab726ca5db1e957ed8095989f8e2e7e554eb65f4
+
+name:           Filehandler
+version:        0.1.0.0
+description:    Please see the README on GitHub at <https://github.com/githubuser/Filehandler#readme>
+homepage:       https://github.com/githubuser/Filehandler#readme
+bug-reports:    https://github.com/githubuser/Filehandler/issues
+author:         Author name here
+maintainer:     example@example.com
+copyright:      2021 Author name here
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    ChangeLog.md
+
+source-repository head
+  type: git
+  location: https://github.com/FileFighter/Filehandler
+
+library
+  exposed-modules:
+      Lib
+  other-modules:
+      Paths_Filehandler
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+  default-language: Haskell2010
+
+executable Filehandler-exe
+  main-is: Main.hs
+  other-modules:
+      Paths_Filehandler
+  hs-source-dirs:
+      app
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      Filehandler
+    , base >=4.7 && <5
+    , req
+    , wai
+    , wai-app-static
+    , wai-extra
+    , wai-cors
+    , warp
+    , network
+    , text
+    , aeson
+    , filepath
+    , http-types
+    , bytestring
+    , directory
+    , case-insensitive
+    , mtl
+    , resourcet
+    , zip
+    , temporary
+  default-language: Haskell2010
+
+test-suite Filehandler-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Paths_Filehandler
+  hs-source-dirs:
+      test
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      Filehandler
+    , base >=4.7 && <5
+    , hspec
+    , QuickCheck
+  default-language: Haskell2010